Changeset 71636 in vbox

Timestamp:

Apr 3, 2018 5:54:57 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Ignore rc when notifying wait events in GuestFile::i_onFileNotify(); those could be long gone at that point of time.

File:

• trunk/src/VBox/Main/src-client/GuestFileImpl.cpp (modified) (7 diffs)

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

@@ -434 +434 @@
         return VERR_INVALID_PARAMETER;
 
-    int vrc = VINF_SUCCESS;
+    int rc = VINF_SUCCESS;
 
     int idx = 1; /* Current parameter index. */
@@ -452 +452 @@
         AssertRC(rc2);
 
-        rc2 = signalWaitEventInternal(pCbCtx, rcGuest, NULL /* pPayload */);
-        AssertRC(rc2);
-
+        /* Ignore rc, as the event to signal might not be there (anymore). */
+        signalWaitEventInternal(pCbCtx, rcGuest, NULL /* pPayload */);
         return VINF_SUCCESS; /* Report to the guest. */
     }
@@ -483 +482 @@
             }
             else
-                vrc = VERR_NOT_SUPPORTED;
+                rc = VERR_NOT_SUPPORTED;
 
             break;
@@ -517 +516 @@
             }
             else
-                vrc = VERR_NOT_SUPPORTED;
+                rc = VERR_NOT_SUPPORTED;
             break;
         }
@@ -538 +537 @@
             }
             else
-                vrc = VERR_NOT_SUPPORTED;
+                rc = VERR_NOT_SUPPORTED;
             break;
         }
@@ -558 +557 @@
             }
             else
-                vrc = VERR_NOT_SUPPORTED;
+                rc = VERR_NOT_SUPPORTED;
             break;
         }
@@ -578 +577 @@
             }
             else
-                vrc = VERR_NOT_SUPPORTED;
+                rc = VERR_NOT_SUPPORTED;
             break;
         }
 
         default:
-            vrc = VERR_NOT_SUPPORTED;
-            break;
-    }
-
-    if (RT_SUCCESS(vrc))
+            rc = VERR_NOT_SUPPORTED;
+            break;
+    }
+
+    if (RT_SUCCESS(rc))
     {
         GuestWaitEventPayload payload(dataCb.uType, &dataCb, sizeof(dataCb));
-        int rc2 = signalWaitEventInternal(pCbCtx, rcGuest, &payload);
-        AssertRC(rc2);
-    }
-
-    LogFlowThisFunc(("uType=%RU32, rcGuest=%Rrc\n",
-                     dataCb.uType, dataCb.rc));
-
-    LogFlowFuncLeaveRC(vrc);
-    return vrc;
+
+        /* Ignore rc, as the event to signal might not be there (anymore). */
+        signalWaitEventInternal(pCbCtx, rcGuest, &payload);
+    }
+
+    LogFlowThisFunc(("uType=%RU32, rcGuest=%Rrc, rc=%Rrc\n", dataCb.uType, rcGuest, rc));
+    return rc;
 }