wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4092 from sfc-gh-anoyes/anoyes/fix-heap-use-after-free 

Fix heap use after free
This commit is contained in:
Jingyu Zhou 2020-11-19 13:49:15 -08:00 committed by GitHub
parent 7305851f23 5c9d7c1d94
commit 8ba4c8aeb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/StorageCache.actor.cpp
View File

@ -1951,7 +1951,7 @@ ACTOR Future<Void> storageCacheStartUpWarmup(StorageCacheData* self) {
state Transaction tr(self->cx); state Transaction tr(self->cx);
state Value trueValue = storageCacheValue(std::vector<uint16_t>{ 0 }); state Value trueValue = storageCacheValue(std::vector<uint16_t>{ 0 });
state Value falseValue = storageCacheValue(std::vector<uint16_t>{}); state Value falseValue = storageCacheValue(std::vector<uint16_t>{});
state MutationRef privatized; state Standalone<MutationRef> privatized;
privatized.type = MutationRef::SetValue; privatized.type = MutationRef::SetValue;
state Version readVersion; state Version readVersion;
try { try {
@ -1969,7 +1969,7 @@ ACTOR Future<Void> storageCacheStartUpWarmup(StorageCacheData* self) {
ASSERT(currCached == (kv.value == falseValue)); ASSERT(currCached == (kv.value == falseValue));
if (kv.value == trueValue) { if (kv.value == trueValue) {
begin = kv.key; begin = kv.key;
privatized.param1 = begin.withPrefix(systemKeys.begin); privatized.param1 = begin.withPrefix(systemKeys.begin, privatized.arena());
privatized.param2 = serverKeysTrue; privatized.param2 = serverKeysTrue;
//TraceEvent(SevDebug, "SCStartupFetch", self->thisServerID). //TraceEvent(SevDebug, "SCStartupFetch", self->thisServerID).
// detail("BeginKey", begin.substr(storageCacheKeys.begin.size())). // detail("BeginKey", begin.substr(storageCacheKeys.begin.size())).
@ -1979,7 +1979,7 @@ ACTOR Future<Void> storageCacheStartUpWarmup(StorageCacheData* self) {
} else { } else {
currCached = false; currCached = false;
end = kv.key; end = kv.key;
privatized.param1 = begin.withPrefix(systemKeys.begin); privatized.param1 = begin.withPrefix(systemKeys.begin, privatized.arena());
privatized.param2 = serverKeysFalse; privatized.param2 = serverKeysFalse;
//TraceEvent(SevDebug, "SCStartupFetch", self->thisServerID).detail("EndKey", end.substr(storageCacheKeys.begin.size())). //TraceEvent(SevDebug, "SCStartupFetch", self->thisServerID).detail("EndKey", end.substr(storageCacheKeys.begin.size())).
// detail("ReadVersion", readVersion).detail("DataVersion", self->version.get()); // detail("ReadVersion", readVersion).detail("DataVersion", self->version.get());