Commit 65cc7665 authored by antirez's avatar antirez
Browse files

Merge branch 'lists' of git://github.com/pietern/redis

parents 6b0253fa cd627d4e
...@@ -4191,7 +4191,6 @@ static robj *rdbLoadObject(int type, FILE *fp) { ...@@ -4191,7 +4191,6 @@ static robj *rdbLoadObject(int type, FILE *fp) {
} else { } else {
ele = tryObjectEncoding(ele); ele = tryObjectEncoding(ele);
listAddNodeTail(o->ptr,ele); listAddNodeTail(o->ptr,ele);
incrRefCount(ele);
} }
} }
} else if (type == REDIS_SET) { } else if (type == REDIS_SET) {
...@@ -5128,6 +5127,7 @@ static void listTypeConvert(robj *subject, int enc) { ...@@ -5128,6 +5127,7 @@ static void listTypeConvert(robj *subject, int enc) {
if (enc == REDIS_ENCODING_LIST) { if (enc == REDIS_ENCODING_LIST) {
list *l = listCreate(); list *l = listCreate();
listSetFreeMethod(l,decrRefCount);
/* listTypeGet returns a robj with incremented refcount */ /* listTypeGet returns a robj with incremented refcount */
li = listTypeInitIterator(subject,0,REDIS_TAIL); li = listTypeInitIterator(subject,0,REDIS_TAIL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment