Skip to content

Commit

Permalink
Add a panic helper for non-assert aborts.
Browse files Browse the repository at this point in the history
We merged a fix for a "maybe uninitialized" warning in #1209, but after
merging there could actually have then been a double free.

The reason is that when compiling with NDEBUG our assert macro becomes a
no-op, meaning that execution would no longer stop after `assert(NULL)`.

This commit just adds a simple panic macro which will execute regardless
of whether NDEBUG is defined or not.
  • Loading branch information
michael-grunder committed Jul 25, 2023
1 parent bfe45d9 commit e07ae7d
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions test.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ static long long usec(void) {
#define assert(e) (void)(e)
#endif

#define redisTestPanic(msg) \
do { \
fprintf(stderr, "PANIC: %s (In function \"%s\", file \"%s\", line %d)\n", \
msg, __func__, __FILE__, __LINE__); \
exit(1); \
} while (1)

/* Helper to extract Redis version information. Aborts on any failure. */
#define REDIS_VERSION_FIELD "redis_version:"
void get_redis_version(redisContext *c, int *majorptr, int *minorptr) {
Expand Down Expand Up @@ -232,7 +239,7 @@ static redisContext *do_connect(struct config config) {
c = redisConnectFd(fd);
}
} else {
assert(NULL);
redisTestPanic("Unknown connection type!");
}

if (c == NULL) {
Expand Down Expand Up @@ -1352,7 +1359,7 @@ static void test_invalid_timeout_errors(struct config config) {
} else if(config.type == CONN_UNIX) {
c = redisConnectUnixWithTimeout(config.unix_sock.path, config.connect_timeout);
} else {
assert(NULL);
redisTestPanic("Unknown connection type!");
}

test_cond(c != NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
Expand All @@ -1368,7 +1375,7 @@ static void test_invalid_timeout_errors(struct config config) {
} else if(config.type == CONN_UNIX) {
c = redisConnectUnixWithTimeout(config.unix_sock.path, config.connect_timeout);
} else {
assert(NULL);
redisTestPanic("Unknown connection type!");
}

test_cond(c != NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
Expand Down

0 comments on commit e07ae7d

Please sign in to comment.