]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: crash on multipart upload to bucket with policy
authorOr Friedmann <ofriedma@redhat.com>
Thu, 13 May 2021 12:39:02 +0000 (15:39 +0300)
committerOr Friedmann <ofriedma@redhat.com>
Thu, 13 May 2021 13:00:30 +0000 (16:00 +0300)
crash on multipart upload to bucket with policy
Fixes: https://tracker.ceph.com/issues/50556
Signed-off-by: Or Friedmann <ofriedma@redhat.com>
src/rgw/rgw_op.cc

index bbfdc749884168997ba40923740de2f5217b4098..33e52ac535844d22d80b04e037e08c9de83a64e9 100644 (file)
@@ -586,7 +586,10 @@ int rgw_build_bucket_policies(const DoutPrefixProvider *dpp, rgw::sal::Store* st
       s->bucket_exists = false;
       return -ERR_NO_SUCH_BUCKET;
     }
-
+    if (!rgw::sal::Object::empty(s->object.get())) {
+      s->object->set_bucket(s->bucket.get());
+    }
+    
     s->bucket_mtime = s->bucket->get_modification_time();
     s->bucket_attrs = s->bucket->get_attrs();
     ret = read_bucket_policy(dpp, store, s, s->bucket->get_info(),