Merge lp:~ted/indicator-messages/lp1216758 into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

Proposed by Ted Gould
Status: Merged
Approved by: Lars Karlitski
Approved revision: 360
Merged at revision: 362
Proposed branch: lp:~ted/indicator-messages/lp1216758
Merge into: lp:~indicator-applet-developers/indicator-messages/trunk.13.10
Diff against target: 12 lines (+2/-0)
1 file modified
src/im-application-list.c (+2/-0)
To merge this branch: bzr merge lp:~ted/indicator-messages/lp1216758
Reviewer Review Type Date Requested Status
Lars Karlitski (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+182100@code.launchpad.net

Commit message

Protect against invalid actions

Description of the change

Retrace isn't great, but it turns out there's only one call to that function in the codebase :-)

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
Lars Karlitski (larsu) wrote :

Yep, indeed. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/im-application-list.c'
2--- src/im-application-list.c 2013-08-22 13:16:15 +0000
3+++ src/im-application-list.c 2013-08-26 13:28:27 +0000
4@@ -223,6 +223,8 @@
5 GVariant * draw;
6
7 state = g_action_group_get_action_state (G_ACTION_GROUP(app->source_actions), action_name);
8+ if (state == NULL)
9+ return FALSE;
10
11 /* uxsb */
12 draw = g_variant_get_child_value(state, 3);

Subscribers

People subscribed via source and target branches