luo980/hiredis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a panic helper for non-assert aborts.

Browse Source 
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.
This commit is contained in:
michael-grunder 2023-07-17 10:40:55 -07:00 committed by Michael Grunder
parent bfe45d9f80
commit e07ae7d3b6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test.c
View File

@ -104,6 +104,13 @@ static long long usec(void) {
#define assert(e) (void)(e) #define assert(e) (void)(e)
#endif #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. */ /* Helper to extract Redis version information. Aborts on any failure. */
#define REDIS_VERSION_FIELD "redis_version:" #define REDIS_VERSION_FIELD "redis_version:"
void get_redis_version(redisContext *c, int *majorptr, int *minorptr) { void get_redis_version(redisContext *c, int *majorptr, int *minorptr) {
@ -232,7 +239,7 @@ static redisContext *do_connect(struct config config) {
c = redisConnectFd(fd); c = redisConnectFd(fd);
} }
} else { } else {
assert(NULL); redisTestPanic("Unknown connection type!");
} }
if (c == NULL) { if (c == NULL) {
@ -1352,7 +1359,7 @@ static void test_invalid_timeout_errors(struct config config) {
} else if(config.type == CONN_UNIX) { } else if(config.type == CONN_UNIX) {
c = redisConnectUnixWithTimeout(config.unix_sock.path, config.connect_timeout); c = redisConnectUnixWithTimeout(config.unix_sock.path, config.connect_timeout);
} else { } else {
assert(NULL); redisTestPanic("Unknown connection type!");
} }
test_cond(c != NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0); test_cond(c != NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);
@ -1368,7 +1375,7 @@ static void test_invalid_timeout_errors(struct config config) {
} else if(config.type == CONN_UNIX) { } else if(config.type == CONN_UNIX) {
c = redisConnectUnixWithTimeout(config.unix_sock.path, config.connect_timeout); c = redisConnectUnixWithTimeout(config.unix_sock.path, config.connect_timeout);
} else { } else {
assert(NULL); redisTestPanic("Unknown connection type!");
} }
test_cond(c != NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0); test_cond(c != NULL && c->err == REDIS_ERR_IO && strcmp(c->errstr, "Invalid timeout specified") == 0);