petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r7352) -Codechange: add widget_count parameter to the window.

Browse Source 
-Codechange: check whether widget indices are valid for all the (Set|Is)WindowWidget(Disabled|Lowered|Hidden) and related functions.
This commit is contained in:
rubidium
2006-12-04 13:36:27 +00:00
parent 7086936bab
commit c02e39945e
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
window.c
View File

@@ -316,6 +316,7 @@ void DeleteWindow(Window *w)
SetWindowDirty(w);
free(w->widget);
w->widget = NULL;
w->widget_count = 0;
/* Find the window in the z-array, and effectively remove it
* by moving all windows after it one to the left */
@@ -519,8 +520,10 @@ void AssignWidgetToWindow(Window *w, const Widget *widget)
w->widget = realloc(w->widget, sizeof(*w->widget) * index);
memcpy(w->widget, widget, sizeof(*w->widget) * index);
w->widget_count = index - 1;
} else {
w->widget = NULL;
w->widget_count = 0;
}
}
@@ -877,6 +880,7 @@ void UnInitWindowSystem(void)
FOR_ALL_WINDOWS(wz) {
free((*wz)->widget);
(*wz)->widget = NULL;
(*wz)->widget_count = 0;
}
}