summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYehuda Sadeh <yehuda@inktank.com>2013-09-18 10:37:21 -0700
committerYehuda Sadeh <yehuda@inktank.com>2013-09-19 13:07:42 -0700
commitbabeb00c42af760b3e7575166479e95365cfcc0a (patch)
treebd8b1e05cee0b13547cc9bf81f2f9601f9e3d884
parentdaf85c45dd4d158bc7c33a2fb784857bc7db35cd (diff)
downloadceph-babeb00c42af760b3e7575166479e95365cfcc0a.tar.gz
rgw: use bufferlist::append() instead of bufferlist::push_back()
push_back() expects char *, whereas append can append a single char. Appending a NULL char to push_back is cast as a NULL pointer which is bad. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com> (cherry picked from commit 08fe028bad13096d482454a2f303158727c363ff)
-rw-r--r--src/rgw/rgw_rados.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index bada7d22d1b..5ec61b965a1 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -2616,7 +2616,7 @@ int RGWRados::copy_obj(void *ctx,
{ /* opening scope so that we can do goto, sorry */
bufferlist& extra_data_bl = processor.get_extra_data();
if (extra_data_bl.length()) {
- extra_data_bl.push_back((char)0);
+ extra_data_bl.append((char)0);
JSONParser jp;
if (!jp.parse(extra_data_bl.c_str(), extra_data_bl.length())) {
ldout(cct, 0) << "failed to parse response extra data. len=" << extra_data_bl.length() << " data=" << extra_data_bl.c_str() << dendl;