rgw: fix segfault pipe modify without zone params

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)

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index d6a9035d27cd2fdc8d7b020552e82e28ecabf6f7..ce6a60a8cee69053048d072905c484baa30c1657 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -9214,11 +9214,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);