commit 91bb1f974cb21f2bd181aaf32976f382fb73190f
author Stephane Lussier <stephane@macadamian.com> Tue Feb 09 14:07:07 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Feb 09 14:07:07 1999 +0000
tree 5c7ef754a7168d42af77197ddd776b7cbeed713a
parent 4d713f97e0fcd9dac4436529fd4cc000332b2cce

- Cleaned up the message queue when a thread exit (but not the process).
- Modified QUEUE_DeleteMsgQueue to exit gracefully (without crashing Wine) if
  queue link list is corrupted.

windows/queue.c

diff --git a/windows/queue.c b/windows/queue.c
index fcaff97..9195e27 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -512,9 +512,18 @@
     while (*pPrev && (*pPrev != hQueue))
     {
         MESSAGEQUEUE *msgQ = (MESSAGEQUEUE*)GlobalLock16(*pPrev);
+
+        /* sanity check */
+        if ( !msgQ || (msgQ->magic != QUEUE_MAGIC) )
+        {
+            /* HQUEUE link list is corrupted, try to exit gracefully */
+            WARN( msg, "HQUEUE link list corrupted!\n");
+            pPrev = 0;
+            break;
+        }
         pPrev = &msgQ->next;
     }
-    if (*pPrev) *pPrev = msgQueue->next;
+    if (pPrev && *pPrev) *pPrev = msgQueue->next;
     msgQueue->self = 0;
 
     SYSTEM_UNLOCK();
@@ -579,7 +588,7 @@
 
 
 /***********************************************************************
- *           QUEUE_SetWakeBit               `
+ *           QUEUE_SetWakeBit
  *
  * See "Windows Internals", p.449
  */