import Ceph Pacific 16.2.4

[ceph.git] / ceph / src / rgw / rgw_rest_swift.cc

diff --git a/ceph/src/rgw/rgw_rest_swift.cc b/ceph/src/rgw/rgw_rest_swift.cc
index 0a8d6cdf99325d4f4c328309184b225efb603692..11bf7abd03aa21c7f284e0526436b554faecbc2f 100644 (file)
--- a/ceph/src/rgw/rgw_rest_swift.cc
+++ b/ceph/src/rgw/rgw_rest_swift.cc
@@ -2560,6 +2560,9 @@ bool RGWSwiftWebsiteHandler::is_web_dir() const
     return false;
   } else if (subdir_name.back() == '/') {
     subdir_name.pop_back();
+    if (subdir_name.empty()) {
+      return false;
+    }
   }
 
   rgw::sal::RGWRadosObject obj(store, rgw_obj_key(std::move(subdir_name)), s->bucket.get());