Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 02:25:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed accessing memory that has already been freed

Browse source 
svn path=/trunk/; revision=8854
This commit is contained in:
Thomas Bluemel 2004-03-23 22:24:27 +00:00
parent 39c6756765
commit 68d825d0da
1 changed files with 21 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
reactos/subsys/win32k/ntuser/msgqueue.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: msgqueue.c,v 1.76 2004/03/11 16:17:25 weiden Exp $ /* $Id: msgqueue.c,v 1.77 2004/03/23 22:24:27 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -240,7 +240,7 @@ MsqIsDblClk(PWINDOW_OBJECT Window, PUSER_MESSAGE Message, BOOL Remove)
BOOL STATIC STDCALL BOOL STATIC STDCALL
MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh, MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed, PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed, BOOL RemoveWhenFreed,
PWINDOW_OBJECT ScopeWin, PUSHORT HitTest, PWINDOW_OBJECT ScopeWin, PUSHORT HitTest,
PPOINT ScreenPoint, BOOL FromGlobalQueue) PPOINT ScreenPoint, BOOL FromGlobalQueue)
{ {
@ -298,6 +298,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
else else
{ {
IntReleaseWindowObject(Window); IntReleaseWindowObject(Window);
if(RemoveWhenFreed)
{
RemoveEntryList(&Message->ListEntry);
}
ExFreePool(Message); ExFreePool(Message);
*Freed = TRUE; *Freed = TRUE;
return(FALSE); return(FALSE);
@ -346,6 +350,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
if (Window == NULL) if (Window == NULL)
{ {
if(RemoveWhenFreed)
{
RemoveEntryList(&Message->ListEntry);
}
ExFreePool(Message); ExFreePool(Message);
*Freed = TRUE; *Freed = TRUE;
return(FALSE); return(FALSE);
@ -377,6 +385,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
{ {
/* we do not hold more than one WM_MOUSEMOVE message in the queue */ /* we do not hold more than one WM_MOUSEMOVE message in the queue */
Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg; Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg;
if(RemoveWhenFreed)
{
RemoveEntryList(&Message->ListEntry);
}
ExFreePool(Message); ExFreePool(Message);
*Freed = TRUE; *Freed = TRUE;
} }
@ -404,6 +416,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
{ {
/* we do not hold more than one WM_MOUSEMOVE message in the queue */ /* we do not hold more than one WM_MOUSEMOVE message in the queue */
Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg; Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg;
if(RemoveWhenFreed)
{
RemoveEntryList(&Message->ListEntry);
}
ExFreePool(Message); ExFreePool(Message);
*Freed = TRUE; *Freed = TRUE;
} }
@ -527,7 +543,7 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
Current->Msg.message <= WM_MOUSELAST) Current->Msg.message <= WM_MOUSELAST)
{ {
Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh, Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh,
Current, Remove, &Freed, Current, Remove, &Freed, TRUE,
DesktopWindow, &HitTest, DesktopWindow, &HitTest,
&ScreenPoint, FALSE); &ScreenPoint, FALSE);
if (Accept) if (Accept)
@ -546,9 +562,7 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
IntReleaseWindowObject(DesktopWindow); IntReleaseWindowObject(DesktopWindow);
return(TRUE); return(TRUE);
} }
if(Freed)
RemoveEntryList(&Current->ListEntry);
} }
} }
IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockHardwareMessageQueue(MessageQueue);
@ -598,7 +612,7 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
const ULONG ActiveStamp = HardwareMessageQueueStamp; const ULONG ActiveStamp = HardwareMessageQueueStamp;
/* Translate the message. */ /* Translate the message. */
Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh, Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh,
Current, Remove, &Freed, Current, Remove, &Freed, FALSE,
DesktopWindow, &HitTest, DesktopWindow, &HitTest,
&ScreenPoint, TRUE); &ScreenPoint, TRUE);
if (Accept) if (Accept)