]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix segfault pipe modify without zone params 51256/head
authorcaisan <caishan1993@foxmail.com>
Wed, 9 Mar 2022 08:04:07 +0000 (16:04 +0800)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 27 Apr 2023 12:17:01 +0000 (19:17 +0700)
radosgw-admin occurs segfault when executing sync
group pipe modify without zone params.

Fix: https://tracker.ceph.com/issues/54504

Signed-off-by: caisan <caishan1993@foxmail.com>
(cherry picked from commit 88c06fb76227cc79d3f9c8280c22041f221a3ef8)

src/rgw/rgw_admin.cc

index 6f44b51d9b7e0cfd6a094b60f9777e7a3fa8abf6..ab2cb8c7ca10209c40c0748de11fad78cb901838 100644 (file)
@@ -8592,11 +8592,15 @@ next:
       }
     }
 
-    pipe->source.add_zones(*opt_source_zone_ids);
+    if (opt_source_zone_ids) {
+      pipe->source.add_zones(*opt_source_zone_ids);
+    }
     pipe->source.set_bucket(opt_source_tenant,
                             opt_source_bucket_name,
                             opt_source_bucket_id);
-    pipe->dest.add_zones(*opt_dest_zone_ids);
+    if (opt_dest_zone_ids) {
+      pipe->dest.add_zones(*opt_dest_zone_ids);
+    }
     pipe->dest.set_bucket(opt_dest_tenant,
                             opt_dest_bucket_name,
                             opt_dest_bucket_id);