Fix memory leak in NormalResolver (#163)

an-tao · web-flow · commit cba221a87fad · 2021-08-07T14:04:07.000+08:00
diff --git a/trantor/net/inner/NormalResolver.cc b/trantor/net/inner/NormalResolver.cc
@@ -65,6 +65,10 @@ void NormalResolver::resolve(const std::string &hostname,
             if (error == -1 || res == nullptr)
             {
                 LOG_SYSERR << "InetAddress::resolve";
+                if (res != nullptr)
+                {
+                    freeaddrinfo(res);
+                }
                 callback(InetAddress{});
                 return;
             }
@@ -83,6 +87,7 @@ void NormalResolver::resolve(const std::string &hostname,
                 addr = *reinterpret_cast<struct sockaddr_in6 *>(res->ai_addr);
                 inet = InetAddress(addr);
             }
+            freeaddrinfo(res);
             callback(inet);
             {
                 std::lock_guard<std::mutex> guard(thisPtr->globalMutex());

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ void NormalResolver::resolve(const std::string &hostname,`
`65`	`65`	`if (error == -1 \|\| res == nullptr)`
`66`	`66`	`{`
`67`	`67`	`LOG_SYSERR << "InetAddress::resolve";`
	`68`	`+ if (res != nullptr)`
	`69`	`+ {`
	`70`	`+ freeaddrinfo(res);`
	`71`	`+ }`
`68`	`72`	`callback(InetAddress{});`
`69`	`73`	`return;`
`70`	`74`	`}`
`@@ -83,6 +87,7 @@ void NormalResolver::resolve(const std::string &hostname,`
`83`	`87`	`addr = reinterpret_cast<struct sockaddr_in6 >(res->ai_addr);`
`84`	`88`	`inet = InetAddress(addr);`
`85`	`89`	`}`
	`90`	`+ freeaddrinfo(res);`
`86`	`91`	`callback(inet);`
`87`	`92`	`{`
`88`	`93`	`std::lock_guard<std::mutex> guard(thisPtr->globalMutex());`