Changeset 54810 in vbox

Timestamp:

Mar 17, 2015 12:15:29 PM (10 years ago)

Author:

vboxsync

Message:

vboxDrvCfgInfQueryFirstPnPId: Initialize return value so we don't pass uninitialized string pointers to the non-standard-log-rel-crap.

File:

• trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -349 +349 @@
 static HRESULT vboxDrvCfgInfQueryFirstPnPId(HINF hInf, LPWSTR *lppszPnPId)
 {
+    *lppszPnPId = NULL;
+
     LPWSTR lpszModels;
     LPWSTR lpszPnPId;
@@ -371 +373 @@
 
         if (hr != S_OK)
-        {
             NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) failed, hr=0x%x\n", lpszModels, hr));
-        }
     }
     /* free models string right away */
     free(lpszModels);
     if (hr != S_OK)
-    {
         return hr;
-    }
 
     *lppszPnPId = lpszPnPId;