Changeset 40151 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Feb 16, 2012 2:38:47 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76302

Message:

Main/webservice: fix potential NULL dereference on VBoxSVC crash, and use the newest authentication entry point available in the auth library.

Location:

trunk/src/VBox/Main/webservice

Files:

• vboxweb.cpp (modified) (2 diffs)
• vboxweb.h (modified) (1 diff)

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -1721 +1721 @@
         pVirtualBox = g_pVirtualBox;
     }
-    pVirtualBox.queryInterfaceTo(ppVirtualBox);
     if (pVirtualBox.isNull())
         return rc;
+    pVirtualBox.queryInterfaceTo(ppVirtualBox);
 
     util::AutoReadLock lock(g_pAuthLibLockHandle COMMA_LOCKVAL_SRC_POS);
@@ -1760 +1760 @@
 
                 if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY3_NAME, (void**)&pfnAuthEntry3)))
+                {
                     WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY3_NAME, rc));
 
-                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY2_NAME, (void**)&pfnAuthEntry2)))
-                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY2_NAME, rc));
-
-                if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY_NAME, (void**)&pfnAuthEntry)))
-                    WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY_NAME, rc));
+                    if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY2_NAME, (void**)&pfnAuthEntry2)))
+                    {
+                        WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY2_NAME, rc));
+
+                        if (RT_FAILURE(rc = RTLdrGetSymbol(hlibAuth, AUTHENTRY_NAME, (void**)&pfnAuthEntry)))
+                            WEBDEBUG(("%s(): Could not resolve import '%s'. Error code: %Rrc\n", __FUNCTION__, AUTHENTRY_NAME, rc));
+                    }
+                }
 
                 if (pfnAuthEntry || pfnAuthEntry2 || pfnAuthEntry3)

trunk/src/VBox/Main/webservice/vboxweb.h

@@ -22 +22 @@
 void WebLog(const char *pszFormat, ...);
 
-#define WEBDEBUG(a) if (g_fVerbose) { WebLog a; }
+#define WEBDEBUG(a) do { if (g_fVerbose) { WebLog a; } } while (0)
 
 #ifdef DEBUG