aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-05-24 13:26:12 +0000
committermarha <marha@users.sourceforge.net>2011-05-24 13:26:12 +0000
commit134e84afc1e0fa3725e41dff781536a05ef724ff (patch)
tree5eafefae8a2e19967d54e6c6a9d611cd62cce051 /xorg-server
parent3b187e634e391e0109094b6e8ecceb98d1432e90 (diff)
downloadvcxsrv-134e84afc1e0fa3725e41dff781536a05ef724ff.tar.gz
vcxsrv-134e84afc1e0fa3725e41dff781536a05ef724ff.tar.bz2
vcxsrv-134e84afc1e0fa3725e41dff781536a05ef724ff.zip
Solved possible crash because windows window disappears in the middle of a function call1.10.1.1
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/hw/xwin/winmultiwindowwm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index fae132329..015192070 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -1685,6 +1685,11 @@ winApplyHints (Display *pDisplay, Window iWindow, HWND hWnd, HWND *zstyle)
if (hint & HINT_NOMAXIMIZE)
style = style & ~WS_MAXIMIZEBOX;
+ if (!IsWindow (hWnd))
+ {
+ ErrorF("Windows window 0x%x has become invalid, so returning without applying hints\n",hWnd);
+ return;
+ }
if (winMultiWindowGetWMNormalHints(pWin, &SizeHints))
{