Changeset 29997 in vbox for trunk

Timestamp:

Jun 2, 2010 1:39:06 PM (15 years ago)

Author:

vboxsync

Message:

Main: add missing NULL ptr checks that can cause webservice to fail

File:

• trunk/src/VBox/Main/GuestImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/GuestImpl.cpp

@@ -269 +269 @@
         mMemoryBalloonSize = aMemoryBalloonSize;
         /* forward the information to the VMM device */
-        VMMDev *vmmDev = mParent->getVMMDev();
-        if (vmmDev)
-            vmmDev->getVMMDevPort()->pfnSetMemoryBalloon(vmmDev->getVMMDevPort(), aMemoryBalloonSize);
+        VMMDev *pVMMDev = mParent->getVMMDev();
+        if (pVMMDev)
+        {
+            PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
+            ComAssertRet(pVMMDevPort, E_FAIL);
+            pVMMDevPort->pfnSetMemoryBalloon(pVMMDevPort, aMemoryBalloonSize);
+        }
     }
 
@@ -299 +303 @@
     mStatUpdateInterval = aUpdateInterval;
     /* forward the information to the VMM device */
-    VMMDev *vmmDev = mParent->getVMMDev();
-    if (vmmDev)
-        vmmDev->getVMMDevPort()->pfnSetStatisticsInterval(vmmDev->getVMMDevPort(), aUpdateInterval);
+    VMMDev *pVMMDev = mParent->getVMMDev();
+    if (pVMMDev)
+    {
+        PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
+        ComAssertRet(pVMMDevPort, E_FAIL);
+        pVMMDevPort->pfnSetStatisticsInterval(pVMMDevPort, aUpdateInterval);
+    }
 
     return S_OK;
@@ -393 +401 @@
 
     /* forward the information to the VMM device */
-    VMMDev *vmmDev = mParent->getVMMDev();
-    if (vmmDev)
-    {
+    VMMDev *pVMMDev = mParent->getVMMDev();
+    if (pVMMDev)
+    {
+        PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
+        ComAssertRet(pVMMDevPort, E_FAIL);
+
         uint32_t u32Flags = VMMDEV_SETCREDENTIALS_GUESTLOGON;
         if (!aAllowInteractiveLogon)
             u32Flags = VMMDEV_SETCREDENTIALS_NOLOCALLOGON;
 
-        vmmDev->getVMMDevPort()->pfnSetCredentials(vmmDev->getVMMDevPort(),
+        pVMMDevPort->pfnSetCredentials(pVMMDevPort,
             Utf8Str(aUserName).raw(), Utf8Str(aPassword).raw(),
             Utf8Str(aDomain).raw(), u32Flags);