nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-05-28 23:34:49 -05:00
Code Issues Projects Releases Wiki Activity

Fix a cleanup issue in dlgparam_destroy.

Browse Source 
If a dialog box is destroyed by the program before the user has
pressed one of the result-delivering buttons - e.g. because the parent
window closes so the dialog is no longer relevant to anything anyway -
then dlgparam_destroy would never call the client code's provided
callback. That makes sense in terms of the callback wanting to _take
action_ based on the result of the dialog box, but it ignores the
possibility that the callback may simply need to free its own context
structure.

So now dlgparam_destroy always calls the client's callback, even if
the result it passes is negative (meaning 'the user never got round to
pressing any of the dialog-ending buttons'), and all the existing
client callbacks handle the negative-result case by doing nothing
except freeing any allocated memory they might have.
This commit is contained in:
Simon Tatham 2017-11-26 14:37:38 +00:00
parent 46ba9de2c2
commit 946405341f
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unix/gtkapp.c
View File

@ -192,9 +192,9 @@ static void post_initial_config_box(void *vctx, int result)
{
Conf *conf = (Conf *)vctx;
if (result) {
if (result > 0) {
new_session_window(conf, NULL);
} else {
} else if (result == 0) {
conf_free(conf);
g_application_release(G_APPLICATION(app));
}

3
unix/gtkdlg.c
View File

@ -3316,8 +3316,7 @@ GtkWidget *create_config_box(const char *title, Conf *conf,
static void dlgparam_destroy(GtkWidget *widget, gpointer data)
{
struct dlgparam *dp = (struct dlgparam *)data;
if (dp->retval >= 0)
dp->after(dp->afterctx, dp->retval);
dp->after(dp->afterctx, dp->retval);
dlg_cleanup(dp);
ctrl_free_box(dp->ctrlbox);
#if GTK_CHECK_VERSION(2,0,0)

4
unix/gtkmain.c
View File

@ -551,9 +551,9 @@ static void post_initial_config_box(void *vctx, int result)
*(struct post_initial_config_box_ctx *)vctx;
sfree(vctx);
if (result) {
if (result > 0) {
new_session_window(ctx.conf, ctx.geometry_string);
} else {
} else if (result == 0) {
/* In this main(), which only runs one session in total, a
* negative result from the initial config box means we simply
* terminate. */

7
unix/gtkwin.c
View File

@ -4016,6 +4016,13 @@ static void after_change_settings_dialog(void *vctx, int retval)
sfree(vctx); /* we've copied this already */
if (retval < 0) {
/* If the dialog box was aborted without giving a result
* (probably because the whole session window closed), we have
* nothing further to do. */
return;
}
assert(lenof(ww) == NCFGCOLOURS);
inst->reconfigure_dialog = NULL;