From 9b962d10a4e65fc0bb50d1a4476fdc9503ca1b53 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Fri, 23 Mar 2012 20:21:19 +0100
Subject: [PATCH 1/2] Fixed memory leak in hash loading.

---
 src/rdb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/rdb.c b/src/rdb.c
index 519b645d..1e23fa70 100644
--- a/src/rdb.c
+++ b/src/rdb.c
@@ -859,14 +859,17 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) {
             /* Add pair to ziplist */
             o->ptr = ziplistPush(o->ptr, field->ptr, sdslen(field->ptr), ZIPLIST_TAIL);
             o->ptr = ziplistPush(o->ptr, value->ptr, sdslen(value->ptr), ZIPLIST_TAIL);
-
             /* Convert to hash table if size threshold is exceeded */
             if (sdslen(field->ptr) > server.hash_max_ziplist_value ||
                 sdslen(value->ptr) > server.hash_max_ziplist_value)
             {
+                decrRefCount(field);
+                decrRefCount(value);
                 hashTypeConvert(o, REDIS_ENCODING_HT);
                 break;
             }
+            decrRefCount(field);
+            decrRefCount(value);
         }
 
         /* Load remaining fields and values into the hash table */

From 27688de10e4047c5a747330b441d79a4c43f0c98 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Fri, 23 Mar 2012 15:22:25 +0100
Subject: [PATCH 2/2] RDB load of different encodings test added.

---
 tests/assets/encodings.rdb | Bin 0 -> 667 bytes
 tests/integration/rdb.tcl  |  25 +++++++++++++++++++++++++
 tests/test_helper.tcl      |   1 +
 3 files changed, 26 insertions(+)
 create mode 100644 tests/assets/encodings.rdb
 create mode 100644 tests/integration/rdb.tcl

diff --git a/tests/assets/encodings.rdb b/tests/assets/encodings.rdb
new file mode 100644
index 0000000000000000000000000000000000000000..9fd9b705d16220065ee117a1c1c094f40fb122f2
GIT binary patch
literal 667
zcmbVKu}UOC5UuKJ7oAzb-~v%NHW5S&dS+bpFfmX#Qw_|N?w&>$M|aur5EcU?;j)7>
zGV&XY4SF>ZBR^rkz`zf1tzKQwOdP0r-Cfn)uU@~+^|g&HrPRU;knEK1xGIbhsS?(T
zOp!5$Ql%uLiRxVU_K~%gGG1r2V@aAV)EAeQf1$=iXe|<j22;{nQ=$}F%p{Ms<cW%_
ze93O7(Q3JTH<=IsAUO~O5Ram`Xq3aeQk<FL7zOYM(hCl*LQQB0Ej?bHBUE~DbLEiB
z`cNs4+l`~W__r&HW^KFKE^?^a=3%St%Ccb!cQ>~B7q#x40{=g8Nhbr35aH0(af04|
z31?FkfXdOIL*v>$`m`ZiW?H~$fQQSK0B})18Q{+2^#ErNo(A|lG8gy_c?x0;Mx(`{
zoa#1QiP|F?FVK2I8DyCB=mk$S8nlC&4|~3w8;|#Ox&QtGwHmXU=HND1)gUq}8+2xM
zS?Yc@4yO2OwUpuPICQ~2@KI=m_~m`huJS+FRQ_l1RQDc;oztC1%JaPY56L<A!Cyg&
F{wu@0q2B-i

literal 0
HcmV?d00001

diff --git a/tests/integration/rdb.tcl b/tests/integration/rdb.tcl
new file mode 100644
index 00000000..fdc5495f
--- /dev/null
+++ b/tests/integration/rdb.tcl
@@ -0,0 +1,25 @@
+set server_path [tmpdir "server.rdb-encoding-test"]
+
+# Copy RDB with zipmap encoded hash to server path
+exec cp tests/assets/encodings.rdb $server_path
+
+start_server [list overrides [list "dir" $server_path "dbfilename" "encodings.rdb"]] {
+  test "RDB encoding loading test" {
+    r select 0
+    csvdump r
+  } {"compressible","string","aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+"hash","hash","a","1","aa","10","aaa","100","b","2","bb","20","bbb","200","c","3","cc","30","ccc","300","ddd","400","eee","5000000000",
+"hash_zipped","hash","a","1","b","2","c","3",
+"list","list","1","2","3","a","b","c","100000","6000000000","1","2","3","a","b","c","100000","6000000000","1","2","3","a","b","c","100000","6000000000",
+"list_zipped","list","1","2","3","a","b","c","100000","6000000000",
+"number","string","10"
+"set","set","1","100000","2","3","6000000000","a","b","c",
+"set_zipped_1","set","1","2","3","4",
+"set_zipped_2","set","100000","200000","300000","400000",
+"set_zipped_3","set","1000000000","2000000000","3000000000","4000000000","5000000000","6000000000",
+"string","string","Hello World"
+"zset","zset","a","1","b","2","c","3","aa","10","bb","20","cc","30","aaa","100","bbb","200","ccc","300","aaaa","1000","cccc","123456789","bbbb","5000000000",
+"zset_zipped","zset","a","1","b","2","c","3",
+}
+}
+
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index ef128ae2..4954b79e 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -30,6 +30,7 @@ set ::all_tests {
     integration/replication-2
     integration/replication-3
     integration/aof
+    integration/rdb
     unit/pubsub
     unit/slowlog
     unit/scripting