applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prevent the child watcher from accessing already released memory after the

Browse source 
2007-02-26  Jens Granseuer  <jensgr@gmx.net>

	* gnome-about-me-password.c: (stop_passwd), (child_watch_remove),
	(free_passwd_resources): prevent the child watcher from accessing
	already released memory after the dialog has been closed (should fix
	bug #411697)

	* gnome-about-me-password.c: (gnome_about_me_password): unref dialog
	when we're done

	* gnome-about-me.c: (about_me_setup_dialog): remove redundant warning

svn path=/trunk/; revision=7338
This commit is contained in:
Jens Granseuer 2007-02-26 17:05:09 +00:00 • committed by Jens Granseuer
parent 43bb23a860
commit 9ff02af06c
3 changed files with 34 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
capplets/about-me/ChangeLog
View file

@ -1,3 +1,14 @@
2007-02-26 Jens Granseuer <jensgr@gmx.net>
* gnome-about-me-password.c: (stop_passwd), (child_watch_remove),
(free_passwd_resources): prevent the child watcher from accessing
already released memory after the dialog has been closed (should fix
bug #411697)
* gnome-about-me-password.c: (gnome_about_me_password): unref dialog
when we're done
* gnome-about-me.c: (about_me_setup_dialog): remove redundant warning
2007-02-25 Jens Granseuer <jensgr@gmx.net> 2007-02-25 Jens Granseuer <jensgr@gmx.net>
Patch by: Diego Escalante Urrelo <diego@aureal.com.pe> Patch by: Diego Escalante Urrelo <diego@aureal.com.pe>

32
capplets/about-me/gnome-about-me-password.c
View file

@ -134,6 +134,9 @@ enum {
static void static void
stop_passwd (PasswordDialog *pdialog); stop_passwd (PasswordDialog *pdialog);
static void
child_watch_remove (PasswordDialog *pdialog);
static void static void
free_passwd_resources (PasswordDialog *pdialog); free_passwd_resources (PasswordDialog *pdialog);
@ -270,18 +273,34 @@ stop_passwd (PasswordDialog *pdialog)
* If we return this way we can safely kill passwd as it has completed * If we return this way we can safely kill passwd as it has completed
* its task. * its task.
* *
* Maybe we should run free_passwd_resources here first, and not let * We must run free_passwd_resources here and not let our child
* our child watcher do it? * watcher do it, since it will access invalid memory after the
* dialog has been closed and cleaned up.
*/ */
if (pdialog->backend_pid != -1) { if (pdialog->backend_pid != -1) {
child_watch_remove (pdialog);
kill (pdialog->backend_pid, 9); kill (pdialog->backend_pid, 9);
free_passwd_resources (pdialog);
} }
/* Our child_watch_cb should now handle our kill signal, /* Our child_watch_cb should now handle our kill signal,
* run waitpid and call free_passwd_resources appropriately. */ * run waitpid and call free_passwd_resources appropriately. */
} }
/* Remove the child watcher only */
static void
child_watch_remove (PasswordDialog *pdialog)
{
/* Remove IO watcher */
if (pdialog->backend_stdout_watch_id != 0) {
g_source_remove (pdialog->backend_stdout_watch_id);
pdialog->backend_stdout_watch_id = 0;
}
}
/* Clean up passwd resources */ /* Clean up passwd resources */
static void static void
free_passwd_resources (PasswordDialog *pdialog) free_passwd_resources (PasswordDialog *pdialog)
@ -315,13 +334,7 @@ free_passwd_resources (PasswordDialog *pdialog)
pdialog->backend_stdout = NULL; pdialog->backend_stdout = NULL;
} }
/* Remove IO watcher */ child_watch_remove (pdialog);
if (pdialog->backend_stdout_watch_id != 0) {
g_source_remove (pdialog->backend_stdout_watch_id);
pdialog->backend_stdout_watch_id = 0;
}
/* Close PID */ /* Close PID */
if (pdialog->backend_pid != -1) { if (pdialog->backend_pid != -1) {
@ -1093,5 +1106,6 @@ gnome_about_me_password (GtkWindow *parent)
stop_passwd (pdialog); stop_passwd (pdialog);
gtk_widget_destroy (wpassdlg); gtk_widget_destroy (wpassdlg);
g_queue_free (pdialog->backend_stdin_queue); g_queue_free (pdialog->backend_stdin_queue);
g_object_unref (dialog);
g_free (pdialog); g_free (pdialog);
} }

1
capplets/about-me/gnome-about-me.c
View file

@ -754,7 +754,6 @@ about_me_setup_dialog (void)
"about-me-dialog", NULL); "about-me-dialog", NULL);
if (dialog == NULL) { if (dialog == NULL) {
g_warning ("Unable to load glade file.");
about_me_destroy (me); about_me_destroy (me);
return -1; return -1;
} }