Fix issue with getSearchPath on nullptr on setOldestVersion

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