Changeset 38399 in vbox

Timestamp:

Aug 10, 2011 1:26:20 PM (13 years ago)

Author:

vboxsync

Message:

GuestCtrl: Added missing callback inits.

File:

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

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

@@ -271 +271 @@
         case VBOXGUESTCTRLCALLBACKTYPE_EXEC_OUTPUT:
         {
+            PCALLBACKDATAEXECOUT pData = (PCALLBACKDATAEXECOUT)RTMemAlloc(sizeof(CALLBACKDATAEXECOUT));
+            AssertPtrReturn(pData, VERR_NO_MEMORY);
+            RT_BZERO(pData, sizeof(CALLBACKDATAEXECOUT));
+            pCallback->cbData = sizeof(CALLBACKDATAEXECOUT);
+            pCallback->pvData = pData;
             break;
         }
@@ -276 +281 @@
         case VBOXGUESTCTRLCALLBACKTYPE_EXEC_INPUT_STATUS:
         {
-
+            PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)RTMemAlloc(sizeof(CALLBACKDATAEXECINSTATUS));
+            AssertPtrReturn(pData, VERR_NO_MEMORY);
+            RT_BZERO(pData, sizeof(PCALLBACKDATAEXECINSTATUS));
+            pCallback->cbData = sizeof(PCALLBACKDATAEXECINSTATUS);
+            pCallback->pvData = pData;
             break;
         }
@@ -1769 +1778 @@
             if (RT_SUCCESS(vrc))
             {
-                callback.cbData = sizeof(CALLBACKDATAEXECINSTATUS);
-                PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)RTMemAlloc(callback.cbData);
-                AssertReturn(pData, E_OUTOFMEMORY);
-                RT_BZERO(pData, callback.cbData);
-                callback.pvData = pData;
+                PCALLBACKDATAEXECINSTATUS pData = (PCALLBACKDATAEXECINSTATUS)callback.pvData;
 
                 /* Save PID + output flags for later use. */
@@ -1957 +1962 @@
             if (RT_SUCCESS(vrc))
             {
-                callback.cbData = sizeof(CALLBACKDATAEXECOUT);
-                PCALLBACKDATAEXECOUT pData = (PCALLBACKDATAEXECOUT)RTMemAlloc(callback.cbData);
-                AssertReturn(pData, E_OUTOFMEMORY);
-                RT_BZERO(pData, callback.cbData);
-                callback.pvData = pData;
+                PCALLBACKDATAEXECOUT pData = (PCALLBACKDATAEXECOUT)callback.pvData;
 
                 /* Save PID + output flags for later use. */