From: Vedansh Bhartia <vedanshbhartia@gmail.com>
Date: Thu, 13 Jul 2023 11:08:16 +0000 (+0530)
Subject: rgw: Fix potential null pointer dereference in rgw_user.cc
X-Git-Tag: v19.0.0~823^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c4ec37d179f897fc936c96c3183d42b98c49883;p=ceph.git

rgw: Fix potential null pointer dereference in rgw_user.cc

Signed-off-by: Vedansh Bhartia <vedanshbhartia@gmail.com>
---

diff --git a/src/rgw/driver/rados/rgw_user.cc b/src/rgw/driver/rados/rgw_user.cc
index 65c42ba80d72..b0d116318239 100644
--- a/src/rgw/driver/rados/rgw_user.cc
+++ b/src/rgw/driver/rados/rgw_user.cc
@@ -1393,10 +1393,10 @@ int RGWUser::init(const DoutPrefixProvider *dpp, RGWUserAdminOpState& op_state,
 
     old_info = user->get_info();
     set_populated();
-  }
 
-  if (user_id.empty()) {
-    user_id = user->get_id();
+    if (user_id.empty()) {
+      user_id = user->get_id();
+    }
   }
   op_state.set_initialized();