Changeset 68797 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 20, 2017 10:26:24 AM (8 years ago)

Author:

vboxsync

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

118044

Message:

VideoRec/DrvAudioVideoRec: Added some more checks + assertions.

File:

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

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

@@ -330 +330 @@
             case AVRECCONTAINERTYPE_MAIN_CONSOLE:
             {
-                pSink->Con.Main.pConsole = pThis->pConsole;
+                if (pThis->pConsole)
+                {
+                    pSink->Con.Main.pConsole = pThis->pConsole;
+                }
+                else
+                    rc = VERR_NOT_SUPPORTED;
                 break;
             }
@@ -1019 +1024 @@
     RT_NOREF(fFlags);
 
+    AssertPtrReturn(pDrvIns, VERR_INVALID_POINTER);
+    AssertPtrReturn(pCfg,    VERR_INVALID_POINTER);
+
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
     PDRVAUDIOVIDEOREC pThis = PDMINS_2_DATA(pDrvIns, PDRVAUDIOVIDEOREC);
-
-    AssertPtrReturn(pDrvIns, VERR_INVALID_POINTER);
-    AssertPtrReturn(pCfg, VERR_INVALID_POINTER);
 
     LogRel(("Audio: Initializing video recording audio driver\n"));
@@ -1046 +1051 @@
     void *pvUser;
     int rc = CFGMR3QueryPtr(pCfg, "ObjectConsole", &pvUser); /** @todo r=andy Get rid of this hack and use IHostAudio::SetCallback. */
-    AssertMsgRCReturn(rc, ("Confguration error: No/bad \"ObjectConsole\" value, rc=%Rrc\n", rc), rc);
+    AssertRCReturn(rc, rc);
 
     /* CFGM tree saves the pointer to Console in the Object node of AudioVideoRec. */
     pThis->pConsole = (Console *)pvUser;
+    AssertReturn(!pThis->pConsole.isNull(), VERR_INVALID_POINTER);
 
     /*
@@ -1055 +1061 @@
      */
     rc = CFGMR3QueryPtr(pCfg, "Object", &pvUser); /** @todo r=andy Get rid of this hack and use IHostAudio::SetCallback. */
-    AssertMsgRCReturn(rc, ("Confguration error: No/bad \"Object\" value, rc=%Rrc\n", rc), rc);
+    AssertRCReturn(rc, rc);
 
     pThis->pAudioVideoRec = (AudioVideoRec *)pvUser;
+    AssertPtrReturn(pThis->pAudioVideoRec, VERR_INVALID_POINTER);
+
     pThis->pAudioVideoRec->mpDrv = pThis;