summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2008-05-27 17:57:40 (GMT)
committerColin Walters <walters@verbum.org>2008-05-27 17:57:40 (GMT)
commitf110cd3aa0532ab6cdfb1ee9a19f839700fe32e6 (patch)
treeb9be1809bf4674968d26afc9f992874874810238
parentd20c90aab3b0eca8715deaa59877f35a7d4e345e (diff)
downloaddbus-glib-f110cd3aa0532ab6cdfb1ee9a19f839700fe32e6.tar.gz
dbus-glib-f110cd3aa0532ab6cdfb1ee9a19f839700fe32e6.tar.xz
Bug 12857: Balance va_start/va_end in error case (Kimmo Hämäläinen)
-rw-r--r--dbus/dbus-gparser.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/dbus/dbus-gparser.c b/dbus/dbus-gparser.c
index 2520b5b..ce4f8b2 100644
--- a/dbus/dbus-gparser.c
+++ b/dbus/dbus-gparser.c
@@ -76,7 +76,11 @@ locate_attributes (const char *element_name,
while (name != NULL)
{
- g_return_val_if_fail (retloc != NULL, FALSE);
+ if (retloc == NULL)
+ {
+ va_end (args);
+ return FALSE;
+ }
g_assert (n_attrs < MAX_ATTRS);