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

Fix issue where we reply a dangling pointer

Browse Source 
Former-commit-id: fd11e490c39fe876d979eace5eaec56c645cdfcf
This commit is contained in:
John Sully 2021-04-21 01:19:29 +00:00
parent 9c1cf39b70
commit 6e546b3c44
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db.cpp
View File

@ -3076,6 +3076,7 @@ bool redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
} }
} }
bool fNoInsert = false;
if (!vecInserts.empty()) { if (!vecInserts.empty()) {
lock.arm(c); lock.arm(c);
for (auto &tuple : vecInserts) for (auto &tuple : vecInserts)
@ -3091,9 +3092,16 @@ bool redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
// While unlocked this was already ensured // While unlocked this was already ensured
decrRefCount(o); decrRefCount(o);
sdsfree(sharedKey); sdsfree(sharedKey);
fNoInsert = true;
} }
else else
{ {
if (spexpire != nullptr) {
if (spexpire->when() < mstime()) {
fNoInsert = true;
break;
}
}
dictAdd(m_pdict, sharedKey, o); dictAdd(m_pdict, sharedKey, o);
o->SetFExpires(spexpire != nullptr); o->SetFExpires(spexpire != nullptr);
@ -3117,7 +3125,7 @@ bool redisDbPersistentData::prefetchKeysAsync(client *c, parsed_command &command
lock.disarm(); lock.disarm();
} }
if (fExecOK && cmd->proc == getCommand && !vecInserts.empty()) { if (fExecOK && !fNoInsert && cmd->proc == getCommand && !vecInserts.empty()) {
robj *o = std::get<1>(vecInserts[0]); robj *o = std::get<1>(vecInserts[0]);
if (o != nullptr) { if (o != nullptr) {
addReplyBulk(c, o); addReplyBulk(c, o);