From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Tue, 14 May 2013 17:20:29 +0000 (+0200)
Subject: rgw/rgw_user.cc: fix possible NULL pointer dereference
X-Git-Tag: v0.63~29^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e69257eaee36b34310cd0f77f9ec56b6d2668bac;p=ceph.git

rgw/rgw_user.cc: fix possible NULL pointer dereference

CID 1019559 (#1 of 1): Dereference after null check (FORWARD_NULL)
  var_deref_model: Passing null pointer "usr" to function
  "RGWUser::get_store()", which dereferences it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index b160ff87444c..781fce46eda8 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -992,7 +992,10 @@ int RGWAccessKeyPool::remove(RGWUserAdminOpState& op_state, std::string *err_msg
 RGWSubUserPool::RGWSubUserPool(RGWUser *usr)
 {
   subusers_allowed = (usr != NULL);
-  store = usr->get_store();
+  if (usr)
+    store = usr->get_store();
+  else
+    store = NULL;
   user = usr;
   subuser_map = NULL;
 }