From c14275b9c95d351b920b59342294e1c0ea039488 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 25 Oct 2014 15:28:41 +0200 Subject: Make sure to always call va_end Based on metacity commit: b235d3e78670e30a55f3f746f13003577988bed6 From: Jasper St. Pierre --- src/core/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/core/core.c') 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); } -- cgit v1.2.1