From adb8d3ec7a2c9bd3fc6eb772b7b728830f036f79 Mon Sep 17 00:00:00 2001
From: "A.J. Beamon" <aj.beamon@snowflake.com>
Date: Mon, 23 Jan 2023 11:01:37 -0800
Subject: [PATCH] Fix a memory issue when getting key range locations that
 manifests in particular when getting range split points

---
 fdbclient/NativeAPI.actor.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fdbclient/NativeAPI.actor.cpp b/fdbclient/NativeAPI.actor.cpp
index 2aa8d28b11..90dd2e1e38 100644
--- a/fdbclient/NativeAPI.actor.cpp
+++ b/fdbclient/NativeAPI.actor.cpp
@@ -3015,7 +3015,9 @@ Future<KeyRangeLocationInfo> getKeyLocation(Reference<TransactionState> trState,
 	                      trState->readOptions.present() ? trState->readOptions.get().debugID : Optional<UID>(),
 	                      trState->useProvisionalProxies,
 	                      isBackward,
-	                      trState->readVersionFuture.isReady() ? trState->readVersion() : latestVersion);
+	                      trState->readVersionFuture.isValid() && trState->readVersionFuture.isReady()
+	                          ? trState->readVersion()
+	                          : latestVersion);
 }
 
 ACTOR Future<std::vector<KeyRangeLocationInfo>> getKeyRangeLocations_internal(
@@ -3132,7 +3134,9 @@ Future<std::vector<KeyRangeLocationInfo>> getKeyRangeLocations(Reference<Transac
 	                            trState->spanContext,
 	                            trState->readOptions.present() ? trState->readOptions.get().debugID : Optional<UID>(),
 	                            trState->useProvisionalProxies,
-	                            trState->readVersionFuture.isReady() ? trState->readVersion() : latestVersion);
+	                            trState->readVersionFuture.isValid() && trState->readVersionFuture.isReady()
+	                                ? trState->readVersion()
+	                                : latestVersion);
 }
 
 ACTOR Future<Void> warmRange_impl(Reference<TransactionState> trState, KeyRange keys) {