Merge lp:~charlesk/indicator-messages/lp-1493534-fix-null-error-dereference into lp:indicator-messages/15.10

[Charles Kerr]

When parsing the async response of list_sources(), test GError for NULL before dereferencing it

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:448
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/152/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-wily-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-messages-wily-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-messages-ci/152/rebuild

review: Needs Fixing (continuous-integration)

[lp:~charlesk/indicator-messages/lp-1493534-fix-null-error-dereference]

449. By Charles Kerr on 2015-09-10

fix typo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:449
http://jenkins.qa.ubuntu.com/job/indicator-messages-ci/153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-messages-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-messages-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-messages-ci/153/rebuild

review: Approve (continuous-integration)

[Pete Woods (pete-woods)]

Seems a bit convoluted, but okay :)

review: Approve

Unmerged revisions

449. By Charles Kerr on 2015-09-10

fix typo

448. By Charles Kerr on 2015-09-09

test the GError for NULL before dereferencing it

=== modified file 'src/im-application-list.c'
--- src/im-application-list.c	2015-05-05 16:47:39 +0000
+++ src/im-application-list.c	2015-09-10 13:38:33 +0000
@@ -1004,8 +1004,12 @@
     }
   else
     {
-      g_warning ("could not fetch the list of sources: %s", error->message);
-      g_error_free (error);
+      if ((error != NULL) && (error->message != NULL))
+          g_warning ("could not fetch the list of sources: %s", error->message);
+      else
+          g_warning ("could not fetch the list of sources");
+
+      g_clear_error (&error);
     }
 }