From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 10 Oct 2018 00:20:01 +0000 (-0700)
Subject: rgw-admin: clean dumped attrs
X-Git-Tag: v14.1.0~314^2~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b55c102afc64bbf3f155d886c02452e3f9e1f964;p=ceph.git

rgw-admin: clean dumped attrs

don't show terminating null chars

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 7470e5cb5db0..9c9555bdcdfe 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -1299,11 +1299,8 @@ static bool decode_dump(const char *field_name, bufferlist& bl, Formatter *f)
 
 static bool dump_string(const char *field_name, bufferlist& bl, Formatter *f)
 {
-  string val;
-  if (bl.length() > 0) {
-    val.assign(bl.c_str());
-  }
-  f->dump_string(field_name, val);
+  string val = bl.to_str();
+  f->dump_string(field_name, val.c_str() /* hide encoded null termination chars */);
 
   return true;
 }