summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2016-12-20 13:33:10 +0100
committerantirez <antirez@gmail.com>2016-12-20 13:33:10 +0100
commita764c87b672fa953f321b0d0549e351329c2cebb (patch)
treee51daab10708839af7da8559d19d83598e0139a5
parentaf0284926c5883c1cd1a0bb40188a6897cf11829 (diff)
parent619317da6f115d600c365e6cacd5ece1da97308f (diff)
downloadredis-a764c87b672fa953f321b0d0549e351329c2cebb.tar.gz
Merge branch 'unstable' of github.com:/antirez/redis into unstable
-rw-r--r--src/ziplist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ziplist.c b/src/ziplist.c
index 684f8ccf8..a0939f640 100644
--- a/src/ziplist.c
+++ b/src/ziplist.c
@@ -249,7 +249,7 @@ static unsigned int zipEncodeLength(unsigned char *p, unsigned char encoding, un
} else if ((encoding) == ZIP_STR_14B) { \
(lensize) = 2; \
(len) = (((ptr)[0] & 0x3f) << 8) | (ptr)[1]; \
- } else if (encoding == ZIP_STR_32B) { \
+ } else if ((encoding) == ZIP_STR_32B) { \
(lensize) = 5; \
(len) = ((ptr)[1] << 24) | \
((ptr)[2] << 16) | \