diff options
| author | sanine <sanine.not@pm.me> | 2023-02-04 11:23:37 -0600 |
|---|---|---|
| committer | sanine <sanine.not@pm.me> | 2023-02-04 11:23:37 -0600 |
| commit | 7c93fe6bc9f061484d28115e9fa1ec5f89ce5924 (patch) | |
| tree | 847a46f89fcb9b2e53c84e39a3e153f4dbd7b010 /lily-test.h | |
| parent | c7bf6fcccd50ded889b7cfb853af51e7c5f28d45 (diff) | |
fix segfault when comparing NULL strings
Diffstat (limited to 'lily-test.h')
| -rw-r--r-- | lily-test.h | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/lily-test.h b/lily-test.h index e4f1676..a4dc00a 100644 --- a/lily-test.h +++ b/lily-test.h @@ -48,7 +48,7 @@ #define LILY_VERSION_MAJOR 2 #define LILY_VERSION_MINOR 0 -#define LILY_VERSION_PATCH 0 +#define LILY_VERSION_PATCH 1 #include <stdbool.h> #include <stddef.h> @@ -69,6 +69,9 @@ #define LILY_LOCATION ((__FILE__ ":" STR(__LINE__)) + SOURCE_PATH_SIZE) #endif +#define LILY_NULLSAFE(x) (x==NULL ? "(nil)" : x) +int lily_streq(const char *str1, const char *str2); + /* self-location macro */ #ifndef LILY_TEST_H_LOCATION @@ -161,7 +164,7 @@ void lily_check(int x, const char *location, const char *fmt, ...); #define CHECK_EQF(x, y, fmt) LILY_CHECK_EQF(x, y, #x, #y, fmt) #define LILY_CHECK_EQS(x, y, xstr, ystr) \ - lily_check(strcmp(x, y) == 0, LILY_LOCATION, \ + lily_check(lily_streq(x, y), LILY_LOCATION, \ "CHECK failed: %s == %s\n %s = \"%s\"\n %s = \"%s\"", \ xstr, ystr, xstr, x, ystr, y) #define CHECK_EQS(x, y) LILY_CHECK_EQS(x, y, #x, #y) @@ -194,7 +197,7 @@ void lily_require(int x, const char *location, const char *fmt, ...); #define REQUIRE_EQF(x, y, fmt) LILY_REQUIRE_EQF(x, y, #x, #y, fmt) #define LILY_REQUIRE_EQS(x, y, xstr, ystr) \ - lily_require(strcmp(x, y) == 0, LILY_LOCATION, \ + lily_require(lily_streq(x, y), LILY_LOCATION, \ "REQUIRE failed: %s == %s\n %s = \"%s\"\n %s = \"%s\"", \ xstr, ystr, xstr, x, ystr, y) #define REQUIRE_EQS(x, y) LILY_REQUIRE_EQS(x, y, #x, #y) @@ -368,6 +371,23 @@ void lily_set_epsilon(double epsilon) { lily_g.epsilon = epsilon; } + + +int lily_streq(const char *str1, const char *str2) +{ + if (str1 == NULL && str2 == NULL) { + /* both are null (and therefore equal, i guess) */ + return 1; + } + + if (str1 == NULL || str2 == NULL) { + /* only one is null */ + return 0; + } + + /* neither are null, check normal string equality */ + return strcmp(str1, str2) == 0; +} #endif /* ifdef LILY_TEST_H */ |