Changeset 30076 in vbox for trunk

Timestamp:

Jun 7, 2010 2:24:45 PM (15 years ago)

Author:

vboxsync

Message:

xpcom/ipcd: fix a message handling regression which led to crashes due to incorrectly updated message queue on message discard

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/ipc/ipcd/client/src/ipcdclient.cpp

@@ -384 +384 @@
         if (acceptedRV != IPC_WAIT_NEXT_MESSAGE)
         {
-          // remove from pending queue
-          if (beforeLastChecked)
-            td->pendingQ.RemoveAfter(beforeLastChecked);
-          else
-            td->pendingQ.RemoveFirst();
-
-          if (acceptedRV != IPC_DISCARD_MESSAGE)
+          if (acceptedRV == S_OK)
           {
+            // remove from pending queue
+            if (beforeLastChecked)
+              td->pendingQ.RemoveAfter(beforeLastChecked);
+            else
+              td->pendingQ.RemoveFirst();
+
             lastChecked->mNext = nsnull;
             *aMsg = lastChecked;
             break;
+          }
+          else /* acceptedRV == IPC_DISCARD_MESSAGE */
+          {
+            ipcMessage *nextToCheck = lastChecked->mNext;
+
+            // discard from pending queue
+            if (beforeLastChecked)
+              td->pendingQ.RemoveAfter(beforeLastChecked);
+            else
+              td->pendingQ.RemoveFirst();
+
+            lastChecked = nextToCheck;
+
+            continue;
           }
         }