Merge lp:~robert-ancell/lightdm/process-quit-timeout into lp:lightdm

Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1813
Merged at revision: 1813
Proposed branch: lp:~robert-ancell/lightdm/process-quit-timeout
Merge into: lp:lightdm
Diff against target: 11 lines (+2/-0)
1 file modified
src/process.c (+2/-0)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/process-quit-timeout
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+190267@code.launchpad.net

Commit message

Destroy quit timeout when a process object is destroyed - fixes a crash where a deleted Process object might be accessed after a timeout

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/process.c'
2--- src/process.c 2013-09-05 08:11:23 +0000
3+++ src/process.c 2013-10-09 23:35:19 +0000
4@@ -297,6 +297,8 @@
5
6 g_free (self->priv->command);
7 g_hash_table_unref (self->priv->env);
8+ if (self->priv->quit_timeout)
9+ g_source_remove (self->priv->quit_timeout);
10 if (self->priv->watch)
11 g_source_remove (self->priv->watch);
12

Subscribers

People subscribed via source and target branches