From c1892a0195f02e347ca9da623eb6fe659b8a7083 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Thu, 5 Mar 2015 05:26:48 +0100 Subject: [PATCH] rgw_main.cc: fix null-deref in case get_storage() fails Signed-off-by: Danny Al-Gaaf (cherry picked from commit 921c08fce503e171199f8f8b9208dcdf75ac41c4) --- src/rgw/rgw_main.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 727a8adf5077..26200adc190c 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -1045,10 +1045,9 @@ int main(int argc, const char **argv) RGWRados *store = RGWStoreManager::get_storage(g_ceph_context, true, true); if (!store) { derr << "Couldn't init storage provider (RADOS)" << dendl; - r = EIO; + return EIO; } - if (!r) - r = rgw_perf_start(g_ceph_context); + r = rgw_perf_start(g_ceph_context); rgw_rest_init(g_ceph_context, store->region); -- 2.47.3