Changeset 83958 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Apr 23, 2020 8:24:40 PM (5 years ago)

Author:

vboxsync

Message:

VBoxServiceVMInfo.cpp: Two NT4 fixes. First, the NT4 SP1 workaround for the uninitialized variable in GetTcpipInterfaceList wasn't active due to the lowercased x in RT_ARCH_X86. Second, we were walking a IP_ADAPTER_INFO list even when GetAdaptersInfo wasn't actually called or failed with ERROR_NO_DATA. Set the pAdpInfo and cbAdpInfo variables to NULL and 0 in that case, as the code expects it to be (see NULL checks before the strcmp loop we crashed, or in one instance point got stuck, in). Also, initialize the buffers with zeros. bugref:8489

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -943 +943 @@
 
     ULONG            cbAdpInfo = sizeof(IP_ADAPTER_INFO);
-    IP_ADAPTER_INFO *pAdpInfo  = (IP_ADAPTER_INFO *)RTMemAlloc(cbAdpInfo);
+    IP_ADAPTER_INFO *pAdpInfo  = (IP_ADAPTER_INFO *)RTMemAllocZ(cbAdpInfo);
     if (!pAdpInfo)
     {
@@ -956 +956 @@
         {
             pAdpInfo = pAdpInfoNew;
+            RT_BZERO(pAdpInfo, cbAdpInfo);
             dwRet = g_pfnGetAdaptersInfo(pAdpInfo, &cbAdpInfo);
         }
@@ -965 +966 @@
         /* If no network adapters available / present in the
          * system we pretend success to not bail out too early. */
-        dwRet = ERROR_SUCCESS;
+        RTMemFree(pAdpInfo);
+        pAdpInfo  = NULL;
+        cbAdpInfo = 0;
+        dwRet     = ERROR_SUCCESS;
     }
     if (dwRet != ERROR_SUCCESS)
@@ -994 +998 @@
     INTERFACE_INFO  aInterfaces[20] = {0};
     DWORD           cbReturned      = 0;
-# ifdef RT_ARCH_x86
+# ifdef RT_ARCH_X86
     /* Workaround for uninitialized variable used in memcpy in GetTcpipInterfaceList
        (NT4SP1 at least).  It seems to be happy enough with garbages, no failure