denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

string: Gracefully handle NULL in str*eq() macros

Browse Source
This commit is contained in:
Tobias Brunner
2016-04-04 10:43:46 +02:00
parent 90c8cf6819
commit 85597f2983
2 changed files with 82 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_utils.c
+78
View File
@@ -196,6 +196,82 @@ START_TEST(test_round)
}
END_TEST
/*******************************************************************************
* streq
*/
static struct {
char *a;
char *b;
bool eq;
bool case_eq;
} streq_data[] = {
{NULL, NULL, TRUE, TRUE},
{NULL, "", FALSE, FALSE},
{"", NULL, FALSE, FALSE},
{"abc", "", FALSE, FALSE},
{"abc", "abc", TRUE, TRUE},
{"abc", "ABC", FALSE, TRUE},
};
START_TEST(test_streq)
{
bool eq;
ck_assert(streq(streq_data[_i].a, streq_data[_i].a));
ck_assert(streq(streq_data[_i].b, streq_data[_i].b));
eq = streq(streq_data[_i].a, streq_data[_i].b);
ck_assert(eq == streq_data[_i].eq);
ck_assert(strcaseeq(streq_data[_i].a, streq_data[_i].a));
ck_assert(strcaseeq(streq_data[_i].b, streq_data[_i].b));
eq = strcaseeq(streq_data[_i].a, streq_data[_i].b);
ck_assert(eq == streq_data[_i].case_eq);
}
END_TEST
/*******************************************************************************
* strneq
*/
static struct {
char *a;
char *b;
size_t n;
bool eq;
bool case_eq;
} strneq_data[] = {
{NULL, NULL, 0, TRUE, TRUE},
{NULL, NULL, 10, TRUE, TRUE},
{NULL, "", 0, FALSE, FALSE},
{"", NULL, 0, FALSE, FALSE},
{"abc", "", 0, TRUE, TRUE},
{"abc", "", 1, FALSE, FALSE},
{"abc", "ab", 1, TRUE, TRUE},
{"abc", "ab", 2, TRUE, TRUE},
{"abc", "ab", 3, FALSE, FALSE},
{"abc", "abc", 3, TRUE, TRUE},
{"abc", "abc", 4, TRUE, TRUE},
{"abc", "abC", 2, TRUE, TRUE},
{"abc", "abC", 3, FALSE, TRUE},
};
START_TEST(test_strneq)
{
bool eq;
ck_assert(strneq(strneq_data[_i].a, strneq_data[_i].a, strneq_data[_i].n));
ck_assert(strneq(strneq_data[_i].b, strneq_data[_i].b, strneq_data[_i].n));
eq = strneq(strneq_data[_i].a, strneq_data[_i].b, strneq_data[_i].n);
ck_assert(eq == strneq_data[_i].eq);
ck_assert(strncaseeq(strneq_data[_i].a, strneq_data[_i].a, strneq_data[_i].n));
ck_assert(strncaseeq(strneq_data[_i].b, strneq_data[_i].b, strneq_data[_i].n));
eq = strncaseeq(strneq_data[_i].a, strneq_data[_i].b, strneq_data[_i].n);
ck_assert(eq == strneq_data[_i].case_eq);
}
END_TEST
/*******************************************************************************
* strpfx
*/
@@ -848,6 +924,8 @@ Suite *utils_suite_create()
suite_add_tcase(s, tc);
tc = tcase_create("string helper");
tcase_add_loop_test(tc, test_streq, 0, countof(streq_data));
tcase_add_loop_test(tc, test_strneq, 0, countof(strneq_data));
tcase_add_loop_test(tc, test_strpfx, 0, countof(strpfx_data));
suite_add_tcase(s, tc);
src/libstrongswan/utils/utils/string.h
+4 -4
View File
@@ -27,7 +27,7 @@
*/
static inline bool streq(const char *x, const char *y)
{
return strcmp(x, y) == 0;
return (x == y) || (x && y && strcmp(x, y) == 0);
}
/**
@@ -35,7 +35,7 @@ static inline bool streq(const char *x, const char *y)
*/
static inline bool strneq(const char *x, const char *y, size_t len)
{
return strncmp(x, y, len) == 0;
return (x == y) || (x && y && strncmp(x, y, len) == 0);
}
/**
@@ -51,7 +51,7 @@ static inline bool strpfx(const char *x, const char *prefix)
*/
static inline bool strcaseeq(const char *x, const char *y)
{
return strcasecmp(x, y) == 0;
return (x == y) || (x && y && strcasecmp(x, y) == 0);
}
/**
@@ -59,7 +59,7 @@ static inline bool strcaseeq(const char *x, const char *y)
*/
static inline bool strncaseeq(const char *x, const char *y, size_t len)
{
return strncasecmp(x, y, len) == 0;
return (x == y) || (x && y && strncasecmp(x, y, len) == 0);
}
/**