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

Fix memory leak in RDB load

Browse Source 
Former-commit-id: 06ad1c15d719a34fed36244b12a593f749bbb8a6
This commit is contained in:
John Sully 2020-02-16 18:41:29 -05:00
parent fd375eb95c
commit d3a69998e4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rdb.cpp
View File

@ -1545,9 +1545,15 @@ robj *rdbLoadObject(int rdbtype, rio *rdb, robj *key, uint64_t mvcc_tstamp) {
== NULL) return NULL; == NULL) return NULL;
if (rdbtype == RDB_TYPE_ZSET_2) { if (rdbtype == RDB_TYPE_ZSET_2) {
if (rdbLoadBinaryDoubleValue(rdb,&score) == -1) return NULL; if (rdbLoadBinaryDoubleValue(rdb,&score) == -1) {
sdsfree(sdsele);
return NULL;
}
} else { } else {
if (rdbLoadDoubleValue(rdb,&score) == -1) return NULL; if (rdbLoadDoubleValue(rdb,&score) == -1) {
sdsfree(sdsele);
return NULL;
}
} }
/* Don't care about integer-encoded strings. */ /* Don't care about integer-encoded strings. */
@ -2181,6 +2187,8 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) {
decrRefCount(val); decrRefCount(val);
val = nullptr; val = nullptr;
} }
decrRefCount(key);
key = nullptr;
} }
/* Reset the state that is key-specified and is populated by /* Reset the state that is key-specified and is populated by