]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix segfault pipe modify without zone params 45309/head
authorcaisan <caishan1993@foxmail.com>
Wed, 9 Mar 2022 08:04:07 +0000 (16:04 +0800)
committercaisan <caishan1993@foxmail.com>
Tue, 15 Mar 2022 07:19:04 +0000 (15:19 +0800)
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>
src/rgw/rgw_admin.cc

index 3ea1119e0ff807b18db40b1384d47384266e7810..0aee61957edd0fbc37272f294ffce8068346a1f4 100644 (file)
@@ -9139,11 +9139,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);