Merge lp:~ted/url-dispatcher/lp1476257-activate-dash-desktop into lp:url-dispatcher/15.10

Proposed by Ted Gould
Status: Superseded
Proposed branch: lp:~ted/url-dispatcher/lp1476257-activate-dash-desktop
Merge into: lp:url-dispatcher/15.10
Diff against target: 14 lines (+5/-0)
1 file modified
service/dispatcher.c (+5/-0)
To merge this branch: bzr merge lp:~ted/url-dispatcher/lp1476257-activate-dash-desktop
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+265438@code.launchpad.net

This proposal has been superseded by a proposal from 2016-08-04.

Commit message

Protect the dash from getting NULL urls

Description of the change

No clue who would be sending this URL to the dash, but let's not crash because of it.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) :
review: Approve

Unmerged revisions

88. By Ted Gould

Protect the dash from getting NULL urls

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'service/dispatcher.c'
2--- service/dispatcher.c 2015-06-11 21:47:17 +0000
3+++ service/dispatcher.c 2015-07-21 18:51:09 +0000
4@@ -151,6 +151,11 @@
5 gboolean
6 send_to_dash (const gchar * url)
7 {
8+ if (url == NULL) {
9+ g_warning("Can not send nothing to the dash");
10+ return FALSE;
11+ }
12+
13 GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
14 g_return_val_if_fail(bus != NULL, FALSE);
15

Subscribers

People subscribed via source and target branches