]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: delete_system_obj() fails on empty object name 14065/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 3 Mar 2017 17:10:40 +0000 (12:10 -0500)
committerAlexey Sheplyakov <asheplyakov@mirantis.com>
Tue, 21 Mar 2017 09:16:43 +0000 (13:16 +0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 67401193f871db95a6045915fa59dce8c5dd1012)

src/rgw/rgw_rados.cc

index 4f7af0f4785eada203efe323cecedfc0687d6e66..60bac5611684ae4aadfb33f017d541554f611aad 100644 (file)
@@ -8332,6 +8332,11 @@ int RGWRados::delete_obj(RGWObjectCtx& obj_ctx,
 
 int RGWRados::delete_system_obj(rgw_obj& obj, RGWObjVersionTracker *objv_tracker)
 {
+  if (obj.get_object().empty()) {
+    ldout(cct, 1) << "delete_system_obj got empty object name "
+        << obj << ", returning EINVAL" << dendl;
+    return -EINVAL;
+  }
   rgw_rados_ref ref;
   rgw_bucket bucket;
   int r = get_obj_ref(obj, &ref, &bucket);