From: Martin Willi <martin@revosec.ch>
Date: Mon, 13 Apr 2015 16:22:49 +0000 (+0200)
Subject: enum-names: Fail gracefully when passing a NULL value as enum names
X-Git-Tag: 5.3.1dr1~16^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de1c492a0f2605c68abac9b24fd70cd24ba8a143;p=thirdparty%2Fstrongswan.git

enum-names: Fail gracefully when passing a NULL value as enum names
---

diff --git a/src/libstrongswan/tests/suites/test_enum.c b/src/libstrongswan/tests/suites/test_enum.c
index 53ebd29319..70bfdb2aa2 100644
--- a/src/libstrongswan/tests/suites/test_enum.c
+++ b/src/libstrongswan/tests/suites/test_enum.c
@@ -291,6 +291,15 @@ START_TEST(test_enum_printf_hook_split)
 }
 END_TEST
 
+START_TEST(test_enum_printf_hook_null)
+{
+	char buf[16];
+
+	snprintf(buf, sizeof(buf), "%N", NULL, 7);
+	ck_assert_str_eq("(7)", buf);
+}
+END_TEST
+
 START_TEST(test_enum_printf_hook_flags)
 {
 	char buf[1024];
@@ -406,6 +415,7 @@ Suite *enum_suite_create()
 	tc = tcase_create("enum_printf_hook");
 	tcase_add_loop_test(tc, test_enum_printf_hook_cont, 0, countof(printf_tests_cont));
 	tcase_add_loop_test(tc, test_enum_printf_hook_split, 0, countof(printf_tests_split));
+	tcase_add_test(tc, test_enum_printf_hook_null);
 	tcase_add_loop_test(tc, test_enum_printf_hook_flags, 0, countof(printf_tests_flags));
 	tcase_add_loop_test(tc, test_enum_printf_hook_flags_incomplete, 0, countof(printf_tests_flags_incomplete));
 	tcase_add_loop_test(tc, test_enum_printf_hook_flags_null, 0, countof(printf_tests_flags_null));
diff --git a/src/libstrongswan/utils/enum.c b/src/libstrongswan/utils/enum.c
index 089bebb797..1cead77cae 100644
--- a/src/libstrongswan/utils/enum.c
+++ b/src/libstrongswan/utils/enum.c
@@ -26,6 +26,10 @@
  */
 char *enum_to_name(enum_name_t *e, int val)
 {
+	if (!e)
+	{
+		return NULL;
+	}
 	do
 	{
 		if (val >= e->first && val <= e->last)
@@ -140,7 +144,7 @@ int enum_printf_hook(printf_hook_data_t *data, printf_hook_spec_t *spec,
 	int val = *((int*)(args[1]));
 	char *name, buf[512];
 
-	if (ed->next == ENUM_FLAG_MAGIC)
+	if (ed && ed->next == ENUM_FLAG_MAGIC)
 	{
 		name = enum_flags_to_string(ed, val, buf, sizeof(buf));
 		if (name == NULL)