]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: aws4: fix buffer sharing issue with chunked uploads 10167/head
authorJavier M. Mellid <jmunhoz@igalia.com>
Tue, 14 Jun 2016 09:04:23 +0000 (11:04 +0200)
committerJavier M. Mellid <jmunhoz@igalia.com>
Sat, 30 Jul 2016 16:06:40 +0000 (18:06 +0200)
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
(cherry picked from commit dd9f53115a452e1e4268a1036f8fb69f9c1b86f7)

src/rgw/rgw_op.cc

index 5b19942d8712b6713151bcd037f426b82135b65c..688b285fd4b01c270fe5a8f3973afe825d402f35 100644 (file)
@@ -2431,13 +2431,11 @@ void RGWPutObj::execute()
     if (!len)
       break;
 
-    bufferlist data;
+    bufferlist &data = data_in;
     if (s->aws4_auth_streaming_mode) {
       /* use unwrapped data */
       data = s->aws4_auth->bl;
       len = data.length();
-    } else {
-      data = data_in;
     }
 
     /* do we need this operation to be synchronous? if we're dealing with an object with immutable