Changeset 21996 in vbox

Timestamp:

Aug 5, 2009 1:07:00 PM (15 years ago)

Author:

vboxsync

Message:

icmp_error: don't crash when msrc is NULL (debug builds only).

File:

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

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

@@ -105 +105 @@
         pData->pfGetAdaptersAddresses = (ULONG (WINAPI *)(ULONG, ULONG, PVOID, PIP_ADAPTER_ADDRESSES, PULONG))
                                     GetProcAddress(pData->hmIcmpLibrary, "GetAdaptersAddresses");
-        if (pData->pfGetAdaptersAddresses == NULL) 
+        if (pData->pfGetAdaptersAddresses == NULL)
         {
             LogRel(("NAT: Can't find GetAdapterAddresses in Iphlpapi.dll"));
@@ -113 +113 @@
     if (pData->pfIcmpParseReplies == NULL)
     {
-        if(pData->pfGetAdaptersAddresses == NULL) 
+        if(pData->pfGetAdaptersAddresses == NULL)
             FreeLibrary(pData->hmIcmpLibrary);
         pData->hmIcmpLibrary = LoadLibrary("Icmp.dll");
@@ -251 +251 @@
     if (found == 1 && icm == NULL)
     {
-        if (so->so_state == SS_NOFDREF) 
+        if (so->so_state == SS_NOFDREF)
         {
             /* socket is shutdowning we've already sent ICMP on it.*/
@@ -490 +490 @@
     DEBUG_CALL("icmp_error");
     DEBUG_ARG("msrc = %lx", (long )msrc);
-    DEBUG_ARG("msrc_len = %d", msrc->m_len);
+    DEBUG_ARG("msrc_len = %d", msrc ? msrc->m_len : 0);
 
     if (type!=ICMP_UNREACH && type!=ICMP_TIMXCEED)