]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw_main.cc: fix null-deref in case get_storage() fails
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Thu, 5 Mar 2015 04:26:48 +0000 (05:26 +0100)
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>
Wed, 11 Mar 2015 12:58:41 +0000 (13:58 +0100)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
src/rgw/rgw_main.cc

index f4ef88e027c6e265122fa3d722be0364a83148e2..f09296f38e5b0b0ee9328fb3176359e9ebc6ded9 100644 (file)
@@ -1068,10 +1068,9 @@ int main(int argc, const char **argv)
       g_conf->rgw_enable_gc_threads, g_conf->rgw_enable_quota_threads);
   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);