From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 25 May 2021 06:21:21 +0000 (+0800)
Subject: crimson/onode-staged-tree: fix an use-after-free issue in test
X-Git-Tag: v17.1.0~1858^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41518%2Fhead;p=ceph.git

crimson/onode-staged-tree: fix an use-after-free issue in test

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
index 86c44c08040..250e1ddcd9a 100644
--- a/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
+++ b/src/test/crimson/seastore/onode_tree/test_staged_fltree.cc
@@ -1076,8 +1076,9 @@ class DummyChildPool {
         p_keys = &left->impl->get_keys();
       }
       left->impl->reset(*p_keys, left_is_tail);
+      auto left_addr = left->impl->laddr();
       return left->parent_info().ptr->apply_children_merge<true>(
-          c, std::move(left), left->impl->laddr(), std::move(right), !stole_key);
+          c, std::move(left), left_addr, std::move(right), !stole_key);
     }
 
     DummyChildImpl* impl;