Merge lp://qastaging/~mterry/libdbusmenu/sanitize-null-pointers into lp://qastaging/libdbusmenu/0.5
Proposed by
Michael Terry
| Status: | Merged |
|---|---|
| Approved by: | Ted Gould |
| Approved revision: | 269 |
| Merged at revision: | 270 |
| Proposed branch: | lp://qastaging/~mterry/libdbusmenu/sanitize-null-pointers |
| Merge into: | lp://qastaging/libdbusmenu/0.5 |
| Diff against target: |
26 lines (+8/-2) 1 file modified
libdbusmenu-gtk/parser.c (+8/-2) |
| To merge this branch: | bzr merge lp://qastaging/~mterry/libdbusmenu/sanitize-null-pointers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ted Gould (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Whoops, my version of sanitize_label_text didn't handle NULL well. pango_parse_markup returned FALSE in that case without setting the error pointer. Then my code assumed the error pointer was valid.
So I now check the error pointer as well as added an early exit for being passed a NULL in the first place.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good.
review approve
merge approve