X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Flib%2Ftap.c;h=8bf72f6fcde57dac97fd9673cb0df5efdf9b6b0c;hp=d41a75185fbb6cb38fe498e612b762891fccc3a3;hb=1d6d9e63d669f57302f7932e1d27ef737e34892c;hpb=aa968dde60d1c3cff4dcebcca4b6f5c2b9737829

diff --git a/tests/lib/tap.c b/tests/lib/tap.c
index d41a7518..8bf72f6f 100644
--- a/tests/lib/tap.c
+++ b/tests/lib/tap.c
@@ -24,6 +24,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -82,7 +83,9 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
 	   expansions on it */
 	if(test_name != NULL) {
 		va_start(ap, test_name);
-		vasprintf(&local_test_name, test_name, ap);
+		if (vasprintf(&local_test_name, test_name, ap) == -1) {
+			local_test_name = NULL;
+		}
 		va_end(ap);
 
 		/* Make sure the test name contains more than digits
@@ -293,12 +296,14 @@ int
 skip(unsigned int n, char *fmt, ...)
 {
 	va_list ap;
-	char *skip_msg;
+	char *skip_msg = NULL;
 
 	LOCK;
 
 	va_start(ap, fmt);
-	asprintf(&skip_msg, fmt, ap);
+	if (asprintf(&skip_msg, fmt, ap) == -1) {
+		skip_msg = NULL;
+	}
 	va_end(ap);
 
 	while(n-- > 0) {
@@ -323,7 +328,9 @@ todo_start(char *fmt, ...)
 	LOCK;
 
 	va_start(ap, fmt);
-	vasprintf(&todo_msg, fmt, ap);
+	if (vasprintf(&todo_msg, fmt, ap) == -1) {
+		todo_msg = NULL;
+	}
 	va_end(ap);
 
 	todo = 1;