From 3cb8da8351d6d5cbb48d49ad1caaf5d860d72e70 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 24 Feb 2021 22:24:50 +0800 Subject: [PATCH] tools/rados: assign to optional<> without deref'ing it this change addresses a regression introduced by d333b35aa10bf03a8bc047994d5cf3fed019b49a Signed-off-by: Kefu Chai (cherry picked from commit 41d68594ae6df343782a1c382ac0bddc8cb7cb69) --- src/tools/rados/rados.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index af69c73759e9c..280a51dddb8c0 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -2705,7 +2705,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, } string attr_name(nargs[obj_name ? 1 : 2]); if (!obj_name) { - *obj_name = nargs[1]; + obj_name = nargs[1]; } bufferlist bl; ret = detail::getxattr(io_ctx, *obj_name, attr_name, bl, use_striper); @@ -2726,7 +2726,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, string attr_name(nargs[obj_name ? 1 : 2]); if (!obj_name) { - *obj_name = nargs[1]; + obj_name = nargs[1]; } ret = detail::rmxattr(io_ctx, *obj_name, attr_name, use_striper); -- 2.39.5