isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to always call va_end

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-09-03 16:04:22 -04:00
parent ddb9929dad
commit bf78f067a2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/core.c
View File

@ -89,7 +89,7 @@ meta_core_get (Display *xdisplay,
if (request != META_CORE_WINDOW_HAS_FRAME && if (request != META_CORE_WINDOW_HAS_FRAME &&
(window == NULL || window->frame == NULL)) { (window == NULL || window->frame == NULL)) {
meta_bug ("No such frame window 0x%lx!\n", xwindow); meta_bug ("No such frame window 0x%lx!\n", xwindow);
return; goto out;
} }
while (request != META_CORE_GET_END) { while (request != META_CORE_GET_END) {
@ -99,7 +99,7 @@ meta_core_get (Display *xdisplay,
switch (request) { switch (request) {
case META_CORE_WINDOW_HAS_FRAME: case META_CORE_WINDOW_HAS_FRAME:
*((gboolean*)answer) = window != NULL && window->frame != NULL; *((gboolean*)answer) = window != NULL && window->frame != NULL;
if (!*((gboolean*)answer)) return; /* see above */ if (!*((gboolean*)answer)) goto out; /* see above */
break; break;
case META_CORE_GET_CLIENT_WIDTH: case META_CORE_GET_CLIENT_WIDTH:
*((gint*)answer) = window->rect.width; *((gint*)answer) = window->rect.width;
@ -160,6 +160,7 @@ meta_core_get (Display *xdisplay,
request = va_arg (args, MetaCoreGetType); request = va_arg (args, MetaCoreGetType);
} }
out:
va_end (args); va_end (args);
} }

6
src/ui/theme-parser.c
View File

@ -430,7 +430,11 @@ locate_attributes (GMarkupParseContext *context,
while (name != NULL) while (name != NULL)
{ {
g_return_val_if_fail (retloc != NULL, FALSE); if (retloc == NULL)
{
retval = FALSE;
goto out;
}
g_assert (n_attrs < MAX_ATTRS); g_assert (n_attrs < MAX_ATTRS);