Fixed gethostname memory leak.

Seeed-Studio · Dec 28, 2020 · 71c932f · 71c932f
1 parent 9139dbf
commit 71c932f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 40 deletions.
diff --git a/src/wifi/wifi_api.c b/src/wifi/wifi_api.c
@@ -1264,35 +1264,18 @@ extern void wifi_dns_found(const char *name, ip_addr_t *ipaddr, void *callback_a
 
 int8_t rpc_dns_gethostbyname_addrtype(const char *hostname, binary_t *addr, uint32_t found, const binary_t *callback_arg, uint8_t dns_addrtype)
 {
-    log_d(" called\n\r");
+   log_d(" called\n\r");
     ip_addr_t *addr_info = (ip_addr_t *)erpc_malloc(sizeof(ip_addr_t));
     addr->data = (uint8_t *)addr_info;
     addr->dataLength = sizeof(ip_addr_t);
 
     int ret = 0;
-    if (found != 0)
-    {
-        ret = dns_gethostbyname_addrtype(hostname, addr_info, wifi_dns_found, callback_arg, dns_addrtype);
-        if (addr)
-        {
-            erpc_free(addr);
-        }
-    }
-    else
+
+    ret = dns_gethostbyname_addrtype(hostname, addr_info, wifi_dns_found, callback_arg, dns_addrtype);
+
+    if (ret == ERR_OK && found != 0)
     {
-        ret = dns_gethostbyname_addrtype(hostname, addr_info, NULL, callback_arg, dns_addrtype);
-        if (hostname)
-        {
-            erpc_free(hostname);
-        }
-        if (addr)
-        {
-            free_binary_t_struct(addr);
-        }
-        if (addr)
-        {
-            erpc_free(addr);
-        }
+        wifi_dns_found(hostname, addr_info, callback_arg);
         if (callback_arg)
         {
             free_binary_t_struct(callback_arg);
@@ -1303,6 +1286,19 @@ int8_t rpc_dns_gethostbyname_addrtype(const char *hostname, binary_t *addr, uint
         }
     }
 
+    if (hostname)
+    {
+        erpc_free(hostname);
+    }
+    if (addr)
+    {
+        free_binary_t_struct(addr);
+    }
+    if (addr)
+    {
+        erpc_free(addr);
+    }
+
     log_d("exit");
     return ret;
 }

diff --git a/src/wifi/wifi_callback.c b/src/wifi/wifi_callback.c
@@ -347,23 +347,6 @@ void wifi_dns_found(const char *name, ip_addr_t *ipaddr, void *callback_arg)
 
     rpc_wifi_dns_found(name, &b_ipaddr, b_callback_arg);
 
-    if (name)
-    {
-        erpc_free(name);
-    }
-    if (ipaddr)
-    {
-        erpc_free(ipaddr);
-    }
-    if (callback_arg)
-    {
-        free_binary_t_struct(callback_arg);
-    }
-    if (callback_arg)
-    {
-        erpc_free(callback_arg);
-    }
-
     if (callback_arg)
     {
         free_binary_t_struct(callback_arg);