Changeset 3038 for pjproject/trunk

Timestamp:

Dec 29, 2009 5:37:51 PM (15 years ago)

Author:

bennylp

Message:

More ticket #1000:

• fixed bug caused by r3030. If an adapter with NULL firstUnicastAddress is found, the function will return uninitialized array element.

File:

• pjproject/trunk/pjlib/src/pj/ip_helper_win32.c (modified) (1 diff)

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

@@ -276 +276 @@
         return PJ_RETURN_OS_ERROR(rc);
 
-    for (i=0; i<*p_cnt && adapter; ++i, adapter = adapter->Next) {
+    for (i=0; i<*p_cnt && adapter; adapter = adapter->Next) {
         if (adapter->FirstUnicastAddress) {
             SOCKET_ADDRESS *pAddr = &adapter->FirstUnicastAddress->Address;
-            ifs[i].addr.sa_family = pAddr->lpSockaddr->sa_family;
-            pj_memcpy(&ifs[i], pAddr->lpSockaddr, pAddr->iSockaddrLength);
+            if (pAddr->lpSockaddr->sa_family == PJ_AF_INET ||
+                pAddr->lpSockaddr->sa_family == PJ_AF_INET6)
+            {
+                ifs[i].addr.sa_family = pAddr->lpSockaddr->sa_family;
+                pj_memcpy(&ifs[i], pAddr->lpSockaddr, pAddr->iSockaddrLength);
+                ++i;
+            }
         }
     }