X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Ftalloc%2Ftalloc.c;h=f2335410eac65a812c50103b957daa1a522cdc05;hb=a6bb8cc856f43730ee04f2bae7d974551560a420;hp=c660870543a83ff4d6dcee74ac516f599bd0709b;hpb=32e6a41f33e5576716b351bd473a27939fe94fa1;p=petitboot

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index c660870..f233541 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -26,19 +26,27 @@
   inspired by http://swapped.cc/halloc/
 */
 
-
+#if defined(HAVE_CONFIG_H)
 #include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
+#else
 /* nfsim additions */
 #define HAVE_SYS_TYPES_H
 #define HAVE_UNISTD_H
 #define HAVE_STDARG_H
 #define HAVE_STDINT_H
 #define HAVE_VA_COPY
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if !defined(NDEBUG)
+#include <assert.h>
+#define TALLOC_ABORT(reason) do{ \
+	fprintf(stderr, "%s: name: %s\n", __func__, tc->name); \
+	assert(0 && reason);} while (0)
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -976,6 +984,7 @@ char *talloc_vasprintf(const void *t, const char *fmt, va_list ap)
 		talloc_set_name_const(ret, ret);
 	}
 
+	va_end(ap2);
 	return ret;
 }
 
@@ -1023,13 +1032,16 @@ 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;
 }