From: Samuel Mendoza-Jonas <sam.mj@au1.ibm.com>
Date: Fri, 18 Dec 2015 03:04:15 +0000 (+1100)
Subject: lib/talloc: Avoid early exit before va_end()
X-Git-Tag: v1.0.0~26
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=e25641dc14753cc070ecf50e10809ce3ce8b9ecd

lib/talloc: Avoid early exit before va_end()

Fixes Coverity defect #30486

Signed-off-by: Sam Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index fa34323..f233541 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -1032,13 +1032,15 @@ static char *talloc_vasprintf_append(char *s, const char *fmt, va_list ap)
 	len = vsnprintf(NULL, 0, fmt, ap2);
 
 	s = talloc_realloc(NULL, s, char, s_len + len+1);
-	if (!s) return NULL;
+	if (!s)
+		goto out;
 
 	VA_COPY(ap2, ap);
 
 	vsnprintf(s+s_len, len+1, fmt, ap2);
 	talloc_set_name_const(s, s);
 
+out:
 	va_end(ap2);
 	return s;
 }