From a2e27b810edfad18b3ecc9c176a4606f94a2f0e4 Mon Sep 17 00:00:00 2001 From: oranagra Date: Tue, 24 May 2016 14:52:43 +0300 Subject: [PATCH] fix crash in BITFIELD GET on non existing key or wrong type see #3259 this was a bug in the recent refactoring: bee963c4459223d874e3294a0d8638a588d33c8e --- src/bitops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bitops.c b/src/bitops.c index 781cc58d..a07633fa 100644 --- a/src/bitops.c +++ b/src/bitops.c @@ -1060,12 +1060,14 @@ void bitfieldCommand(client *c) { } else { /* GET */ unsigned char buf[9]; - long strlen; + long strlen = 0; unsigned char *src = NULL; char llbuf[LONG_STR_SIZE]; - o = lookupKeyRead(c->db,c->argv[1]); - src = getObjectReadOnlyString(o,&strlen,llbuf); + if ((o = lookupKeyRead(c->db,c->argv[1])) != NULL) { + if (checkType(c,o,OBJ_STRING)) continue; + src = getObjectReadOnlyString(o,&strlen,llbuf); + } /* For GET we use a trick: before executing the operation * copy up to 9 bytes to a local buffer, so that we can easily