From 5e726d1f4bbb64df33671392acb6e0e2dd8e5610 Mon Sep 17 00:00:00 2001 From: gaosibei Date: Fri, 10 Nov 2017 10:11:26 +0800 Subject: [PATCH] rgw: fix null pointer crush Signed-off-by: Sibei Gao --- src/rgw/rgw_rados.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 27f313110db..98a0570a38e 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -5900,7 +5900,11 @@ int RGWRados::select_bucket_location_by_rule(const string& location_rule, RGWZon /* we can only reach here if we're trying to set a bucket location from a bucket * created on a different zone, using a legacy / default pool configuration */ - return select_legacy_bucket_placement(rule_info); + if (rule_info) { + return select_legacy_bucket_placement(rule_info); + } + + return 0; } /* @@ -5942,7 +5946,11 @@ int RGWRados::select_bucket_placement(RGWUserInfo& user_info, const string& zone pselected_rule_name->clear(); } - return select_legacy_bucket_placement(rule_info); + if (rule_info) { + return select_legacy_bucket_placement(rule_info); + } + + return 0; } int RGWRados::select_legacy_bucket_placement(RGWZonePlacementInfo *rule_info) -- 2.39.5