Properly free encoded sorted set

[redis.git] / src / object.c

diff --git a/src/object.c b/src/object.c
index a6bf8a20560cadf0ab651f73b6c4c1285f502bff..c384d6004522af47a2fbf5055f7522434994344c 100644 (file)
--- a/src/object.c
+++ b/src/object.c
@@ -138,11 +138,20 @@ void freeSetObject(robj *o) {
 }
 
 void freeZsetObject(robj *o) {
-    zset *zs = o->ptr;
-
-    dictRelease(zs->dict);
-    zslFree(zs->zsl);
-    zfree(zs);
+    zset *zs;
+    switch (o->encoding) {
+    case REDIS_ENCODING_RAW:
+        zs = o->ptr;
+        dictRelease(zs->dict);
+        zslFree(zs->zsl);
+        zfree(zs);
+        break;
+    case REDIS_ENCODING_ZIPLIST:
+        zfree(o->ptr);
+        break;
+    default:
+        redisPanic("Unknown sorted set encoding");
+    }
 }
 
 void freeHashObject(robj *o) {