From 76ba367f70708e73348bb08df81b08aceb4c5b69 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 4 Jul 2015 13:25:38 +0800 Subject: [PATCH] tools/rados: fix the segfault introduced in 0f7aeee prefix and run_name should not be initialized by a temporary string Signed-off-by: Kefu Chai --- src/tools/rados/rados.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index f0bb7accf7b..5c7973c5777 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -1191,8 +1191,8 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, bool show_time = false; bool wildcard = false; - const char* run_name = NULL; - const char* prefix = NULL; + std::string run_name; + std::string prefix; Formatter *formatter = NULL; bool pretty_format = false; @@ -1233,11 +1233,11 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, } i = opts.find("run-name"); if (i != opts.end()) { - run_name = i->second.c_str(); + run_name = i->second; } i = opts.find("prefix"); if (i != opts.end()) { - prefix = i->second.c_str(); + prefix = i->second; } i = opts.find("block-size"); if (i != opts.end()) { -- 2.47.3