Changeset 44440 in vbox for trunk

Timestamp:

Jan 29, 2013 9:24:20 AM (12 years ago)

Author:

vboxsync

Message:

Main: UsbWebcamInterface: do not crash if VM has no webcam.

File:

• trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp (modified) (4 diffs)

trunk/src/VBox/Main/src-client/UsbWebcamInterface.cpp

@@ -163 +163 @@
             if (mpRemote)
             {
-                mpDrv->pIWebcamUp->pfnWebcamUpDetached(mpDrv->pIWebcamUp,
-                                                       mpRemote->u64DeviceId);
+                if (mpDrv->pIWebcamUp)
+                {
+                    mpDrv->pIWebcamUp->pfnWebcamUpDetached(mpDrv->pIWebcamUp,
+                                                           mpRemote->u64DeviceId);
+                }
 
                 /* No need to tell the server by calling VideoInDeviceDetach because the server is telling. */
@@ -192 +195 @@
     if (RT_SUCCESS(rcRequest))
     {
-        mpDrv->pIWebcamUp->pfnWebcamUpAttached(mpDrv->pIWebcamUp,
-                                               pRemote->u64DeviceId,
-                                               (const PDMIWEBCAM_DEVICEDESC *)pDeviceDesc,
-                                               cbDeviceDesc);
+        if (mpDrv->pIWebcamUp)
+        {
+            mpDrv->pIWebcamUp->pfnWebcamUpAttached(mpDrv->pIWebcamUp,
+                                                   pRemote->u64DeviceId,
+                                                   (const PDMIWEBCAM_DEVICEDESC *)pDeviceDesc,
+                                                   cbDeviceDesc);
+        }
     }
     else
@@ -216 +222 @@
     bool fResponse = (pvUser != NULL);
 
-    mpDrv->pIWebcamUp->pfnWebcamUpControl(mpDrv->pIWebcamUp,
-                                          fResponse,
-                                          pvUser,
-                                          mpRemote->u64DeviceId,
-                                          (const PDMIWEBCAM_CTRLHDR *)pControl,
-                                          cbControl);
+    if (mpDrv->pIWebcamUp)
+    {
+        mpDrv->pIWebcamUp->pfnWebcamUpControl(mpDrv->pIWebcamUp,
+                                              fResponse,
+                                              pvUser,
+                                              mpRemote->u64DeviceId,
+                                              (const PDMIWEBCAM_CTRLHDR *)pControl,
+                                              cbControl);
+    }
 
     RTMemFree(pvUser);
@@ -232 +241 @@
                  rcRequest, pDeviceCtx, pFrame, cbFrame));
 
-    mpDrv->pIWebcamUp->pfnWebcamUpFrame(mpDrv->pIWebcamUp,
-                                        mpRemote->u64DeviceId,
-                                        (const uint8_t *)pFrame,
-                                        cbFrame);
+    if (mpDrv->pIWebcamUp)
+    {
+        mpDrv->pIWebcamUp->pfnWebcamUpFrame(mpDrv->pIWebcamUp,
+                                            mpRemote->u64DeviceId,
+                                            (const uint8_t *)pFrame,
+                                            cbFrame);
+    }
 }