Changeset 3123

Timestamp:

Mar 27, 2010 3:08:08 AM (14 years ago)

Author:

bennylp

Message:

Fixed ticket #1048: Memory leak in enum_ipv4_ipv6_interface (ip_helper_win32.c) (thanks Andrey Mamchur for the report)

File:

• pjproject/trunk/pjlib/src/pj/ip_helper_win32.c (modified) (4 diffs)

pjproject/trunk/pjlib/src/pj/ip_helper_win32.c

@@ -275 +275 @@
     pj_uint8_t buffer[600];
     IP_ADAPTER_ADDRESSES *adapter = (IP_ADAPTER_ADDRESSES*)buffer;
+    void *adapterBuf = NULL;
     ULONG size = sizeof(buffer);
     ULONG flags;
@@ -288 +289 @@
         if (rc == ERROR_BUFFER_OVERFLOW) {
             /* Retry with larger memory size */
-            adapter = (IP_ADAPTER_ADDRESSES*) malloc(size);
+            adapterBuf = malloc(size);
+            adapter = (IP_ADAPTER_ADDRESSES*) adapterBuf;
             if (adapter != NULL)
                 rc = MyGetAdapterAddresses(af, flags, NULL, adapter, &size);
@@ -294 +296 @@
 
         if (rc != ERROR_SUCCESS) {
-            if (adapter != (IP_ADAPTER_ADDRESSES*)buffer)
-                free(adapter);
+            if (adapterBuf)
+                free(adapterBuf);
             return PJ_RETURN_OS_ERROR(rc);
         }
@@ -351 +353 @@
     }
 
-    if (adapter != (IP_ADAPTER_ADDRESSES*)buffer)
-        free(adapter);
+    if (adapterBuf)
+        free(adapterBuf);
 
     *p_cnt = i;