From 2bb2d9b008fb06045642d8b4e43f0bd820138c69 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Sat, 5 Jun 1999 11:49:04 +0000 Subject: [PATCH] Fixed potential memory corruption in EVENT_QueryZOrder. Fixed potential X synchronization problem in X11DRV_WND_SetHostAttr. --- windows/x11drv/event.c | 2 +- windows/x11drv/wnd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c index 23db64efae7..23a7424f58f 100644 --- a/windows/x11drv/event.c +++ b/windows/x11drv/event.c @@ -343,7 +343,7 @@ static Window __get_common_ancestor( Window A, Window B, TSXQueryTree( display, A, &root, &A, children, total ); TSXQueryTree( display, B, &root, &B, &childrenB, &totalB ); if( childrenB ) TSXFree( childrenB ); - if( *children ) TSXFree( *children ); + if( *children ) TSXFree( *children ), *children = NULL; } while( A != B && A && B ); if( A && B ) diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c index d9964df2af6..0b98071641a 100644 --- a/windows/x11drv/wnd.c +++ b/windows/x11drv/wnd.c @@ -812,7 +812,7 @@ BOOL X11DRV_WND_SetHostAttr(WND* wnd, INT ha, INT value) else { XEvent xe; - XMapWindow(display, w ); + TSXMapWindow(display, w ); while( !TSXCheckTypedWindowEvent( display, w, MapNotify, &xe) ); } }