Light Display Manager

Merge lp:~robert-ancell/lightdm/handle-corrupt-xauthority into lp:lightdm

  1. handle-corrupt-xauthority
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Approved by: Robert Ancell
Approved revision: 1804
Merged at revision: 1803
Proposed branch: lp:~robert-ancell/lightdm/handle-corrupt-xauthority
Merge into: lp:lightdm
Diff against target: 20 lines (+2/-1)
1 file modified
src/x-authority.c (+2/-1)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/handle-corrupt-xauthority
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Robert Ancell Approve
Review via email: mp+188256@code.launchpad.net

Commit message

Don't fail writing X authority if reading it had an error

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)
Revision history for this message
Till Kamppeter (till-kamppeter) wrote :

I have tested this patch and it fixes bug 1228570.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/x-authority.c'
2--- src/x-authority.c 2013-09-10 23:14:12 +0000
3+++ src/x-authority.c 2013-09-30 03:00:01 +0000
4@@ -237,7 +237,7 @@
5 gboolean
6 x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar *filename, GError **error)
7 {
8- gchar *input;
9+ gchar *input = NULL;
10 gsize input_length = 0, input_offset = 0;
11 GList *link, *records = NULL;
12 XAuthority *a;
13@@ -328,6 +328,7 @@
14 }
15
16 errno = 0;
17+ result = TRUE;
18 for (link = records; link && result; link = link->next)
19 {
20 XAuthority *a = link->data;

Subscribers

People subscribed via source and target branches