From: Martin Willi <martin@revosec.ch>
Date: Wed, 15 Apr 2015 10:02:45 +0000 (+0200)
Subject: unit-tests: Pass stringyfied assertion statement as non-format string argument
X-Git-Tag: 5.3.1dr1~17^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b40c9646ce04a5dd21353ae62747e1e9670d7c7;p=thirdparty%2Fstrongswan.git

unit-tests: Pass stringyfied assertion statement as non-format string argument

If the assertion contains a modulo (%) operation, test_fail_msg() handles
this as printf() format specifier. Pass the assertion string as argument for
an explicit "%s" in the format string, instead.
---

diff --git a/src/libstrongswan/tests/test_suite.h b/src/libstrongswan/tests/test_suite.h
index da57ab46c4..aedd8c0117 100644
--- a/src/libstrongswan/tests/test_suite.h
+++ b/src/libstrongswan/tests/test_suite.h
@@ -313,7 +313,7 @@ void test_fail_if_worker_failed();
 	test_fail_if_worker_failed(); \
 	if (!(x)) \
 	{ \
-		test_fail_msg(__FILE__, __LINE__, #x); \
+		test_fail_msg(__FILE__, __LINE__, "%s", #x); \
 	} \
 })
 
@@ -329,7 +329,7 @@ void test_fail_if_worker_failed();
 	test_fail_if_worker_failed(); \
 	if (!(x)) \
 	{ \
-		test_fail_msg(__FILE__, __LINE__, #x ": " fmt, ##__VA_ARGS__); \
+		test_fail_msg(__FILE__, __LINE__, "%s: " fmt, #x, ##__VA_ARGS__); \
 	} \
 })
 
@@ -349,7 +349,7 @@ void test_fail_if_worker_failed();
 	test_fail_if_worker_failed(); \
 	if (x) \
 	{ \
-		test_fail_msg(__FILE__, __LINE__, #x ": " fmt, ##__VA_ARGS__); \
+		test_fail_msg(__FILE__, __LINE__, "%s : " fmt, #x, ##__VA_ARGS__); \
 	} \
 })
 #define fail_unless test_assert_msg