Changeset 40061 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 10, 2012 2:02:45 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl/Main: Added some assertions for GetProcessOutput().

File:

• trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp (modified) (2 diffs)

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

@@ -2114 +2114 @@
                 uHandleID = OUTPUT_HANDLE_ID_STDERR;
 
+            /** @todo Use a buffer for next iteration if returned data is too big
+             *        for current read.
+             *        aSize is bogus -- will be ignored atm! */
             VBOXGUESTCTRL_CALLBACK callback;
             vrc = callbackInit(&callback, VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT, pProgress);
@@ -2182 +2185 @@
                         if (pExecOut->cbData)
                         {
+                            bool fResize;
+
                             /* Do we need to resize the array? */
                             if (pExecOut->cbData > aSize)
-                                outputData.resize(pExecOut->cbData);
+                            {
+                                fResize = outputData.resize(pExecOut->cbData);
+                                Assert(fResize);
+                            }
 
                             /* Fill output in supplied out buffer. */
+                            Assert(outputData.size() >= pExecOut->cbData);
                             memcpy(outputData.raw(), pExecOut->pvData, pExecOut->cbData);
-                            outputData.resize(pExecOut->cbData); /* Shrink to fit actual buffer size. */
+                            fResize = outputData.resize(pExecOut->cbData); /* Shrink to fit actual buffer size. */
+                            Assert(fResize);
                         }
                         else
                         {
                             /* No data within specified timeout available. */
-                            outputData.resize(0);
+                            bool fResize = outputData.resize(0);
+                            Assert(fResize);
                         }