From 94fded4f4f9c3d52d69969c4a2a9d82786a3ac16 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sun, 17 Oct 2021 18:48:15 +0300 Subject: [PATCH] Code cleanup, resolve an issue identified by cppcheck (#4373) [src/bitops.c:512] -> [src/bitops.c:507]: (warning) Either the condition 'if(o&&o->encoding==1)' is redundant or there is possible null pointer dereference: o. This function has checks for `o` to be null or non-null, so it is odd that it accesses it first.. --- src/bitops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bitops.c b/src/bitops.c index 435ab7a33..5190e1035 100644 --- a/src/bitops.c +++ b/src/bitops.c @@ -508,7 +508,7 @@ robj *lookupStringForBitCommand(client *c, uint64_t maxbit, int *created) { * If the source object is NULL the function is guaranteed to return NULL * and set 'len' to 0. */ unsigned char *getObjectReadOnlyString(robj *o, long *len, char *llbuf) { - serverAssert(o->type == OBJ_STRING); + serverAssert(!o || o->type == OBJ_STRING); unsigned char *p = NULL; /* Set the 'p' pointer to the string, that can be just a stack allocated