Changeset 21341 for trunk/src

Timestamp:

Sep 9, 2009, 7:08:31 PM (16 years ago)

Author:

vladest

Message:

Reworked double free check to make sure the patch will not harm other apps

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (1 diff)
• pmwindow.cpp (modified) (1 diff)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -221 +221 @@
             winMsg->lParam  = packet->lParam;
             if (fMsgRemoved == MSG_REMOVE)
-                OSLibCleanupPacket(teb, packet, winMsg);
+            {
+                /* avoid double free */
+                if (os2Msg->mp2)
+                {
+                    OSLibCleanupPacket(teb, packet, winMsg);
+                    os2Msg->mp2 = NULL;
+                }
+#ifdef DEBUG
+                else
+                    dprintf(("Trying to free NULL in WinMsgTranslate"));
+#endif
+            }
             if(win32wnd) RELEASE_WNDOBJ(win32wnd);
             return TRUE;

trunk/src/user32/pmwindow.cpp

@@ -592 +592 @@
 
         /* sometimes MSG_REMOVE here caused to double free of the message */
-        if(OS2ToWinMsgTranslate((PVOID)teb, &qmsg, &winMsg, FALSE, /*MSG_REMOVE*/0) == FALSE)
+        if(OS2ToWinMsgTranslate((PVOID)teb, &qmsg, &winMsg, FALSE, MSG_REMOVE) == FALSE)
         {//message was not translated
             memset(&winMsg, 0, sizeof(MSG));