DBus Menu

Merge lp:~mterry/libdbusmenu/tiny-crit-fix into lp:libdbusmenu/0.5

  1. tiny-crit-fix
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Merged at revision: 192
Proposed branch: lp:~mterry/libdbusmenu/tiny-crit-fix
Merge into: lp:libdbusmenu/0.5
Diff against target: 11 lines (+1/-1)
1 file modified
libdbusmenu-glib/client.c (+1/-1)
To merge this branch: bzr merge lp:~mterry/libdbusmenu/tiny-crit-fix
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+47415@code.launchpad.net
To post a comment you must log in.
lp:~mterry/libdbusmenu/tiny-crit-fix updated
192. By Michael Terry

avoid critical warning from calling a function on a NULL pointer

Revision history for this message
Michael Terry (mterry) wrote :

Whoops, the previous push was based off Ubuntu's branch, not the upstream branch. Correct branch pushed in same place.

Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/client.c'
2--- libdbusmenu-glib/client.c 2011-01-19 14:55:37 +0000
3+++ libdbusmenu-glib/client.c 2011-01-25 18:21:30 +0000
4@@ -1441,7 +1441,7 @@
5 /* We've got everything built up at this node and reconcilled */
6
7 /* Flush the properties requests if this is the first level */
8- if (dbusmenu_menuitem_get_id(parent) == 0) {
9+ if (parent != NULL && dbusmenu_menuitem_get_id(parent) == 0) {
10 get_properties_flush(client);
11 }
12

Subscribers

People subscribed via source and target branches