diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2013-09-03 16:04:22 -0400 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2014-09-27 18:33:00 +0300 |
| commit | b235d3e78670e30a55f3f746f13003577988bed6 (patch) | |
| tree | f17284ce890f3a08bd5060944650ef31044d364e | |
| parent | 52a524ee4a7e14d99451ea3f596b353ddf7957d4 (diff) | |
| download | metacity-b235d3e78670e30a55f3f746f13003577988bed6.tar.gz | |
Make sure to always call va_end
| -rw-r--r-- | src/core/core.c | 5 | ||||
| -rw-r--r-- | src/ui/theme-parser.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core/core.c b/src/core/core.c index 68ba70a6..cf95259a 100644 --- a/src/core/core.c +++ b/src/core/core.c @@ -87,7 +87,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) { @@ -97,7 +97,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; @@ -212,6 +212,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 c7684c87..9deecd22 100644 --- a/src/ui/theme-parser.c +++ b/src/ui/theme-parser.c @@ -444,7 +444,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); |