read_logical_snp_obj: pass user_ctx to prevent memleak (#617)

Ensure user_ctx is passed up to NuRaft regardless of the return value to enable the cleanup of the allocated context object. Signed-off-by: Jilong Kou <[email protected]>
eBay · Dec 20, 2024 · 6695df2 · 6695df2
1 parent 4bd3e12
commit 6695df2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/conanfile.py b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomestoreConan(ConanFile):
     name = "homestore"
-    version = "6.5.28"
+    version = "6.5.29"
 
     homepage = "https://github.com/eBay/Homestore"
     description = "HomeStore Storage Engine"

diff --git a/src/lib/replication/repl_dev/raft_state_machine.cpp b/src/lib/replication/repl_dev/raft_state_machine.cpp
@@ -332,10 +332,9 @@ int RaftStateMachine::read_logical_snp_obj(nuraft::snapshot& s, void*& user_ctx,
 
     // Listener will read the snapshot data and we pass through the same.
     int ret = m_rd.m_listener->read_snapshot_obj(snp_ctx, snp_data);
+    user_ctx = snp_data->user_ctx; // Have to pass the user_ctx to NuRaft even if ret<0 to get it freed later
     if (ret < 0) return ret;
 
-    // Update user_ctx and whether is_last_obj
-    user_ctx = snp_data->user_ctx;
     is_last_obj = snp_data->is_last_obj;
 
     // We are doing a copy here.