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

Timestamp:

Jun 9, 2020 7:24:27 PM (5 years ago)

Author:

vboxsync

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

138539

Message:

Guest Control/Main: Handling throw()ing VBox rc for GuestWaitEventPayload constructor. bugref:9320

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (1 diff)
• src-client/GuestFileImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/GuestCtrlImplPrivate.h

@@ -1047 +1047 @@
           pvData(NULL) { }
 
+    /**
+     * Initialization constructor. Will throw() VBox status code (rc).
+     *
+     * @param   uTypePayload    Payload type to set.
+     * @param   pvPayload       Pointer to payload data to set (deep copy).
+     * @param   cbPayload       Size (in bytes) of payload data to set.
+     */
     GuestWaitEventPayload(uint32_t uTypePayload,
                           const void *pvPayload, uint32_t cbPayload)

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

@@ -855 +855 @@
                     AssertRCReturn(vrc, vrc);
 
-                    GuestWaitEventPayload evPayload(dataCb.uType, dataCb.pvPayload, dataCb.cbPayload); /* This bugger throws int. */
-                    vrc = signalWaitEventInternal(pCtxCb, dataCb.rc, &evPayload);
+                    try
+                    {
+                        GuestWaitEventPayload evPayload(dataCb.uType, dataCb.pvPayload, dataCb.cbPayload);
+                        vrc = signalWaitEventInternal(pCtxCb, dataCb.rc, &evPayload);
+                    }
+                    catch (int rcEx) /* Thrown by GuestWaitEventPayload constructor. */
+                    {
+                        vrc = rcEx;
+                    }
                 }
                 else

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

@@ -670 +670 @@
     if (RT_SUCCESS(rc))
     {
-        GuestWaitEventPayload payload(dataCb.uType, &dataCb, sizeof(dataCb));
-
-        /* Ignore rc, as the event to signal might not be there (anymore). */
-        signalWaitEventInternal(pCbCtx, rcGuest, &payload);
+        try
+        {
+            GuestWaitEventPayload payload(dataCb.uType, &dataCb, sizeof(dataCb));
+
+            /* Ignore rc, as the event to signal might not be there (anymore). */
+            signalWaitEventInternal(pCbCtx, rcGuest, &payload);
+        }
+        catch (int rcEx) /* Thrown by GuestWaitEventPayload constructor. */
+        {
+            rc = rcEx;
+        }
     }