weaselbot/conflict-set
1
Fork 0
forked from weaselab/conflict-set
Code Pull Requests Activity

Fix issue with getSearchPath on nullptr on setOldestVersion

Browse Source
This commit is contained in:
andrew
2024-03-12 11:02:51 -07:00
parent 471b276947
commit 71e117965e
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConflictSet.cpp
+5 -6
View File
@@ -2033,12 +2033,7 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
if (n == root) { if (n == root) {
n = nextLogical(n); n = nextLogical(n);
} }
for (; keyUpdates > 0; --keyUpdates) { for (; keyUpdates > 0 && n != nullptr; --keyUpdates) {
if (n == nullptr) {
removalKey = {};
return;
}
if (std::max(n->entry.pointVersion, n->entry.rangeVersion) <= if (std::max(n->entry.pointVersion, n->entry.rangeVersion) <=
oldestVersion) { oldestVersion) {
// Any transaction n would have prevented from committing is // Any transaction n would have prevented from committing is
@@ -2052,6 +2047,10 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
n = nextLogical(n); n = nextLogical(n);
} }
} }
if (n == nullptr) {
removalKey = {};
return;
}
removalKeyArena = Arena(); removalKeyArena = Arena();
removalKey = getSearchPath(removalKeyArena, n); removalKey = getSearchPath(removalKeyArena, n);
} }