eukara
/
WebSurf
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix parent pointer use after free in RISC OS dialog handling

This commit is contained in:
John-Mark Bell 2019-12-22 11:13:12 +00:00 committed by Vincent Sanders
parent 55ba27c68f
commit fb4f1d28ba
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontends/riscos/dialog.c
View File

@ -335,12 +335,16 @@ void ro_gui_dialog_close(wimp_w close)
{ {
int i; int i;
wimp_caret caret; wimp_caret caret;
wimp_w parent = -1;
os_error *error; os_error *error;
/* Check if we're a persistent window */ /* Check if we're a persistent window */
for (i = 0; i < MAX_PERSISTENT; i++) { for (i = 0; i < MAX_PERSISTENT; i++) {
if (persistent_dialog[i].dialog == close) { if (persistent_dialog[i].dialog == close) {
/* We are => invalidate record */ /* We are => invalidate record */
if (persistent_dialog[i].parent != NULL) {
parent = persistent_dialog[i].parent;
}
persistent_dialog[i].parent = NULL; persistent_dialog[i].parent = NULL;
persistent_dialog[i].dialog = NULL; persistent_dialog[i].dialog = NULL;
break; break;
@ -363,7 +367,7 @@ void ro_gui_dialog_close(wimp_w close)
/* Check if we are a persistent window */ /* Check if we are a persistent window */
if (i < MAX_PERSISTENT) { if (i < MAX_PERSISTENT) {
error = xwimp_set_caret_position( error = xwimp_set_caret_position(
persistent_dialog[i].parent, parent,
wimp_ICON_WINDOW, -100, -100, wimp_ICON_WINDOW, -100, -100,
32, -1); 32, -1);
/* parent may have been closed first */ /* parent may have been closed first */