Changeset 3030 for pjproject/trunk

Timestamp:

Dec 10, 2009 4:56:26 AM (15 years ago)

Author:

bennylp

Message:

More ticket #1000 (IPv6 interface enumeration fails due to typo error in Windows targets):

• fixed crash if GetAdaptersAddresses?() returns adapter with NULL "firstUnicastAddress". This happens when the interface is disabled.

File:

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

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

@@ -238 +238 @@
 
     for (i=0; i<*p_cnt && adapter; ++i, adapter = adapter->Next) {
-        SOCKET_ADDRESS *pAddr = &adapter->FirstUnicastAddress->Address;
-        ifs[i].addr.sa_family = pAddr->lpSockaddr->sa_family;
-        pj_memcpy(&ifs[i], pAddr->lpSockaddr, pAddr->iSockaddrLength);
+        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);
+        }
     }