From 4563c6297d84128e99036e6c1bb517e5de989ce0 Mon Sep 17 00:00:00 2001 From: caisan Date: Wed, 9 Mar 2022 16:04:07 +0800 Subject: [PATCH] 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 (cherry picked from commit 88c06fb76227cc79d3f9c8280c22041f221a3ef8) --- src/rgw/rgw_admin.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 6f44b51d9b7e0..ab2cb8c7ca102 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -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); -- 2.39.5