Changeset 18606 in vbox for trunk

Timestamp:

Apr 1, 2009 4:13:55 PM (16 years ago)

Author:

vboxsync

Message:

slirp.c: leaks in get_dns_addr_domain (hope I fixed it right).

File:

• trunk/src/VBox/Devices/Network/slirp/slirp.c (modified) (8 diffs)

trunk/src/VBox/Devices/Network/slirp/slirp.c

@@ -365 +365 @@
     {
         LogRel(("NAT: error %lu occured on fetching adapters info\n", ret));
+        RTMemFree(addresses);
         return -1;
     }
@@ -384 +385 @@
             {
                 LogRel(("NAT: Can't allocate buffer for DNS entry\n"));
+                RTMemFree(addresses);
                 return VERR_NO_MEMORY;
             }
@@ -402 +404 @@
             RTUtf16ToUtf8(addr->DnsSuffix, &suffix);
             found = 0;
-            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list) 
-            {
-                if (   dd->dd_pszDomain != NULL 
-                    && strcmp(dd->dd_pszDomain, suffix) == 0) 
+            LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
+            {
+                if (   dd->dd_pszDomain != NULL
+                    && strcmp(dd->dd_pszDomain, suffix) == 0)
                 {
                     found = 1;
+                    RTStrFree(suffix);
                     break;
                 }
             }
-            if (found == 0) 
+            if (found == 0)
             {
                 dd = RTMemAllocZ(sizeof(struct dns_domain_entry));
                 if (dd == NULL)
                 {
-                    LogRel(("NAT: not enought memory\n"));
+                    LogRel(("NAT: not enough memory\n"));
+                    RTStrFree(suffix);
+                    RTMemFree(addresses);
                     return VERR_NO_MEMORY;
-                }    
+                }
                 dd->dd_pszDomain = suffix;
                 LogRel(("NAT: adding domain name %s to search list\n", dd->dd_pszDomain));
@@ -429 +434 @@
         addr = addr->Next;
     }
+    RTMemFree(addresses);
     return 0;
 }
@@ -545 +551 @@
             LIST_FOREACH(dd, &pData->dns_domain_list_head, dd_list)
             {
-                if(    tok != NULL 
+                if(    tok != NULL
                     && strcmp(tok, dd->dd_pszDomain) == 0)
                 {
@@ -558 +564 @@
                     LogRel(("NAT: not enought memory to add domain list\n"));
                     return VERR_NO_MEMORY;
-                }    
+                }
                 dd->dd_pszDomain = RTStrDup(tok);
                 LogRel(("NAT: adding domain name %s to search list\n", dd->dd_pszDomain));
@@ -589 +595 @@
         LIST_REMOVE(dd, dd_list);
         if (dd->dd_pszDomain != NULL)
-            RTStrFree(dd->dd_pszDomain); 
+            RTStrFree(dd->dd_pszDomain);
         RTMemFree(dd);
     }
@@ -596 +602 @@
         LIST_REMOVE(dd, dd_list);
         if (dd->dd_pszDomain != NULL)
-            RTStrFree(dd->dd_pszDomain); 
+            RTStrFree(dd->dd_pszDomain);
         RTMemFree(dd);
     }