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

another attempt at fixing bug #411697. The previous commit fell a bit

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

	* gnome-about-me-password.c: (stop_passwd),
	(free_passwd_resources), (passdlg_process_response): another attempt
	at fixing bug #411697. The previous commit fell a bit short

svn path=/trunk/; revision=7343
This commit is contained in:
Jens Granseuer 2007-02-27 19:56:12 +00:00 • committed by Jens Granseuer
parent dcd24e05c5
commit df30efc30f
2 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/about-me/ChangeLog
View file

@ -1,3 +1,9 @@
2007-02-27 Jens Granseuer <jensgr@gmx.net>
* gnome-about-me-password.c: (stop_passwd),
(free_passwd_resources), (passdlg_process_response): another attempt
at fixing bug #411697. The previous commit fell a bit short
2007-02-26 Jens Granseuer <jensgr@gmx.net>
* gnome-about-me-password.c: (stop_passwd), (child_watch_remove),

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

@ -134,9 +134,6 @@ enum {
static void
stop_passwd (PasswordDialog *pdialog);
static void
child_watch_remove (PasswordDialog *pdialog);
static void
free_passwd_resources (PasswordDialog *pdialog);
@ -272,33 +269,20 @@ stop_passwd (PasswordDialog *pdialog)
/* This is the standard way of returning from the dialog with passwd.
* If we return this way we can safely kill passwd as it has completed
* its task.
*
* We must run free_passwd_resources here and not let our child
* watcher do it, since it will access invalid memory after the
* dialog has been closed and cleaned up.
*/
if (pdialog->backend_pid != -1) {
child_watch_remove (pdialog);
kill (pdialog->backend_pid, 9);
free_passwd_resources (pdialog);
}
/* Our child_watch_cb should now handle our kill signal,
* 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;
}
/* We must run free_passwd_resources here and not let our child
* watcher do it, since it will access invalid memory after the
* dialog has been closed and cleaned up.
*
* If we had more than a single thread we'd need to remove
* the child watch before trying to kill the child.
*/
free_passwd_resources (pdialog);
}
/* Clean up passwd resources */
@ -307,6 +291,15 @@ free_passwd_resources (PasswordDialog *pdialog)
{
GError *error = NULL;
/* Remove the child watcher */
if (pdialog->backend_child_watch_id != 0) {
g_source_remove (pdialog->backend_child_watch_id);
pdialog->backend_child_watch_id = 0;
}
/* Close IO channels (internal file descriptors are automatically closed) */
if (pdialog->backend_stdin != NULL) {
@ -334,7 +327,13 @@ free_passwd_resources (PasswordDialog *pdialog)
pdialog->backend_stdout = NULL;
}
child_watch_remove (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;
}
/* Close PID */
if (pdialog->backend_pid != -1) {
@ -937,13 +936,8 @@ passdlg_process_response (PasswordDialog *pdialog, gint response_id)
/* Stop passwd if an error occured and it is still running */
if (pdialog->backend_state == PASSWD_STATE_ERR) {
/* Stop child watcher */
g_source_remove (pdialog->backend_child_watch_id);
pdialog->backend_child_watch_id = 0;
/* Stop passwd, free resources */
stop_passwd (pdialog);
free_passwd_resources (pdialog);
}
/* Check that the backend is still running, or that an error