Fixing invalid shard index - bug

freshworks · Oct 7, 2024 · ebc76f6 · ebc76f6
1 parent 69ece62
commit ebc76f6
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc b/source/extensions/filters/network/redis_proxy/command_splitter_impl.cc
@@ -1311,7 +1311,13 @@ SplitRequestPtr ScanRequest::create(Router& router, Common::Redis::RespValuePtr&
   if (cursor.length() > 4) {
     std::string index = cursor.substr(cursor.length() - 4);
     cursor = cursor.substr(0, cursor.length() - 4);
-    shard_idx = std::stoi(index);
+    try {
+      shard_idx = std::stoi(index);
+    } catch (const std::invalid_argument& e) {
+      ENVOY_LOG(error, "Invalid shard index: '{}'", e.what());
+      callbacks_.onResponse(Common::Redis::Utility::makeError(
+                            fmt::format("unexpected or wrong shard index from cursor")));
+    }
   }
 
   // Completely reconstructing the request to add/modify count since we can't override the incoming array directly