summaryrefslogtreecommitdiff
path: root/src/ui/theme-parser.c
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-25 15:28:41 +0200
committerinfirit <[email protected]>2014-10-25 15:28:41 +0200
commitc14275b9c95d351b920b59342294e1c0ea039488 (patch)
tree199af9ebafdac60e8b3ee18a8ccf3097c243ebd0 /src/ui/theme-parser.c
parent5a302cfa3549e0b371b21a765ba14acff2162073 (diff)
downloadmarco-c14275b9c95d351b920b59342294e1c0ea039488.tar.bz2
marco-c14275b9c95d351b920b59342294e1c0ea039488.tar.xz
Make sure to always call va_end
Based on metacity commit: b235d3e78670e30a55f3f746f13003577988bed6 From: Jasper St. Pierre <[email protected]>
Diffstat (limited to 'src/ui/theme-parser.c')
-rw-r--r--src/ui/theme-parser.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index b7d22381..c94e0e9a 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -392,7 +392,11 @@ locate_attributes (GMarkupParseContext *context,
while (name != NULL)
{
- g_return_val_if_fail (retloc != NULL, FALSE);
+ if (retloc == NULL)
+ {
+ retval = FALSE;
+ goto out;
+ }
g_assert (n_attrs < MAX_ATTRS);