From: Mark Kogan <mkogan@redhat.com>
Date: Mon, 26 Apr 2021 12:36:08 +0000 (+0300)
Subject: rgw: fix segfault related to explicit object manifest handling
X-Git-Tag: v16.2.6~89^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b7131fb828027461ce0cf70230fb97522bd4be1;p=ceph.git

rgw: fix segfault related to explicit object manifest handling

Fixes: https://tracker.ceph.com/issues/50467

Signed-off-by: Mark Kogan <mkogan@redhat.com>
(cherry picked from commit ae00453515b17d25a5d42430e744855b020ccec6)
---

diff --git a/src/rgw/rgw_obj_manifest.cc b/src/rgw/rgw_obj_manifest.cc
index 87dbb9a942fb..ca8c0bae75a4 100644
--- a/src/rgw/rgw_obj_manifest.cc
+++ b/src/rgw/rgw_obj_manifest.cc
@@ -205,6 +205,12 @@ void RGWObjManifest::obj_iterator::operator++()
   if (manifest->explicit_objs) {
     ++explicit_iter;
 
+    if (explicit_iter == manifest->objs.end()) {
+      ofs = manifest->obj_size;
+      stripe_size = 0;
+      return;
+    }
+
     update_explicit_pos();
 
     update_location();