gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a refcounting bug with SORT ... STORE leading to random crashes

Browse Source
This commit is contained in:
root 2009-11-04 11:59:27 +01:00
parent d0ccebcf46
commit 121796f792
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dict.c
View File

@ -226,7 +226,10 @@ int dictAdd(dict *ht, void *key, void *val)
return DICT_OK; return DICT_OK;
} }
/* Add an element, discarding the old if the key already exists */ /* Add an element, discarding the old if the key already exists.
* Return 1 if the key was added from scratch, 0 if there was already an
* element with such key and dictReplace() just performed a value update
* operation. */
int dictReplace(dict *ht, void *key, void *val) int dictReplace(dict *ht, void *key, void *val)
{ {
dictEntry *entry; dictEntry *entry;
@ -234,13 +237,13 @@ int dictReplace(dict *ht, void *key, void *val)
/* Try to add the element. If the key /* Try to add the element. If the key
* does not exists dictAdd will suceed. */ * does not exists dictAdd will suceed. */
if (dictAdd(ht, key, val) == DICT_OK) if (dictAdd(ht, key, val) == DICT_OK)
return DICT_OK; return 1;
/* It already exists, get the entry */ /* It already exists, get the entry */
entry = dictFind(ht, key); entry = dictFind(ht, key);
/* Free the old value and set the new one */ /* Free the old value and set the new one */
dictFreeEntryVal(ht, entry); dictFreeEntryVal(ht, entry);
dictSetHashVal(ht, entry, val); dictSetHashVal(ht, entry, val);
return DICT_OK; return 0;
} }
/* Search and remove an element */ /* Search and remove an element */

4
redis.c
View File

@ -4664,7 +4664,9 @@ static void sortCommand(redisClient *c) {
} }
} }
} }
dictReplace(c->db->dict,storekey,listObject); if (dictReplace(c->db->dict,storekey,listObject)) {
incrRefCount(storekey);
}
/* Note: we add 1 because the DB is dirty anyway since even if the /* Note: we add 1 because the DB is dirty anyway since even if the
* SORT result is empty a new key is set and maybe the old content * SORT result is empty a new key is set and maybe the old content
* replaced. */ * replaced. */