Fix for VM swapping out at DB loading time when key is shared

redis · Jun 7, 2010 · e8de5c7 · e8de5c7
1 parent 61e4ff2
commit e8de5c7
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/redis.c b/redis.c
@@ -4131,10 +4131,18 @@ static int rdbLoad(char *filename) {
             if (de) {
                 key = dictGetEntryKey(de);
                 val = dictGetEntryVal(de);
+
+                if (val->refcount != 1) continue;
+
+                /* Unshare the key if needed */
+                if (key->refcount != 1) {
+                    robj *newkey = dupStringObject(key);
+                    decrRefCount(key);
+                    key = dictGetEntryKey(de) = newkey;
+                }
 
-                if (vmSwapObjectBlocking(key,val) == REDIS_OK) {
+                if (vmSwapObjectBlocking(key,val) == REDIS_OK)
                     dictGetEntryVal(de) = NULL;
-                }
             }
             continue;
         }