Set private data struct to NULL to expose problems in other code

better. Fixes the XUnmapWindow problems reported by replacing them with NULL ptr dereferences.

Set private data struct to NULL to expose problems in other code
308477b6 · Marcus Meissner · Alexandre Julliard · fa5fe429 · 308477b6
Commit 308477b6 authored Jan 23, 1999 by Marcus Meissner Committed by Alexandre Julliard Jan 23, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

wnd.c windows/x11drv/wnd.c +5 -0

No files found.
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -100,6 +100,10 @@ void X11DRV_WND_Finalize(WND *wndPtr)
  X11DRV_WND_DATA *pWndDriverData =
    (X11DRV_WND_DATA *) wndPtr->pDriverData;

+  if (!wndPtr->pDriverData) {
+     ERR(win,"Trying to destroy window again. Not good.\n");
+     return;
+  }
  if(pWndDriverData->window)
    {
      ERR(win, 
@@ -108,6 +112,7 @@ void X11DRV_WND_Finalize(WND *wndPtr)
 	  pWndDriverData->window
      );
    }
+  wndPtr->pDriverData = NULL;
  HeapFree(SystemHeap, 0, wndPtr->pDriverData);
 }