mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12942) -Fix [FS#1979]: closing some windows caused recursion in the Window deletion causing the reading invalid/freed data which could cause crashes.

release/0.7
rubidium 2008-05-04 21:36:37 +00:00
parent cb680474c3
commit 762315c47c
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/window.cpp
View File

@ -416,16 +416,28 @@ void DeleteWindow(Window *w)
{ {
if (w == NULL) return; if (w == NULL) return;
/* Delete any children a window might have in a head-recursive manner */
Window *v = FindChildWindow(w);
if (v != NULL) DeleteWindow(v);
if (_thd.place_mode != VHM_NONE && if (_thd.place_mode != VHM_NONE &&
_thd.window_class == w->window_class && _thd.window_class == w->window_class &&
_thd.window_number == w->window_number) { _thd.window_number == w->window_number) {
ResetObjectToPlace(); ResetObjectToPlace();
} }
/* Prevent Mouseover() from resetting mouse-over coordinates on a non-existing window */
if (_mouseover_last_w == w) _mouseover_last_w = NULL;
/* Find the window in the z-array, and effectively remove it
* by moving all windows after it one to the left. This must be
* done before removing the child so we cannot cause recursion
* between the deletion of the parent and the child. */
Window **wz = FindWindowZPosition(w);
if (wz == NULL) return;
memmove(wz, wz + 1, (byte*)_last_z_window - (byte*)wz);
_last_z_window--;
/* Delete any children a window might have in a head-recursive manner */
Window *v = FindChildWindow(w);
if (v != NULL) DeleteWindow(v);
CallWindowEventNP(w, WE_DESTROY); CallWindowEventNP(w, WE_DESTROY);
if (w->viewport != NULL) DeleteWindowViewport(w); if (w->viewport != NULL) DeleteWindowViewport(w);
@ -435,16 +447,6 @@ void DeleteWindow(Window *w)
w->widget_count = 0; w->widget_count = 0;
w->parent = NULL; w->parent = NULL;
/* Prevent Mouseover() from resetting mouse-over coordinates on a non-existing window */
if (_mouseover_last_w == w) _mouseover_last_w = NULL;
/* Find the window in the z-array, and effectively remove it
* by moving all windows after it one to the left */
Window **wz = FindWindowZPosition(w);
if (wz == NULL) return;
memmove(wz, wz + 1, (byte*)_last_z_window - (byte*)wz);
_last_z_window--;
delete w; delete w;
} }