summaryrefslogtreecommitdiff
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
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]>
-rw-r--r--src/core/core.c5
-rw-r--r--src/ui/theme-parser.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/core.c b/src/core/core.c
index 138e837e..4ba62db7 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -89,7 +89,7 @@ meta_core_get (Display *xdisplay,
if (request != META_CORE_WINDOW_HAS_FRAME &&
(window == NULL || window->frame == NULL)) {
meta_bug ("No such frame window 0x%lx!\n", xwindow);
- return;
+ goto out;
}
while (request != META_CORE_GET_END) {
@@ -99,7 +99,7 @@ meta_core_get (Display *xdisplay,
switch (request) {
case META_CORE_WINDOW_HAS_FRAME:
*((gboolean*)answer) = window != NULL && window->frame != NULL;
- if (!*((gboolean*)answer)) return; /* see above */
+ if (!*((gboolean*)answer)) goto out; /* see above */
break;
case META_CORE_GET_CLIENT_WIDTH:
*((gint*)answer) = window->rect.width;
@@ -210,6 +210,7 @@ meta_core_get (Display *xdisplay,
request = va_arg (args, MetaCoreGetType);
}
+ out:
va_end (args);
}
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);