From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Thu, 11 Jun 2015 13:39:43 +0000 (+0200)
Subject: mon/Monitor.cc: fix potential null deref
X-Git-Tag: v9.1.0~446^2~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0292f96ec93544175d0048ee39727c4de5fd92e5;p=ceph.git

mon/Monitor.cc: fix potential null deref

Access logger object in remove_all_sessions() only if the
object exists.

Fix for:

CID 1225102 (#1 of 1): Dereference before null check (REVERSE_INULL)
 check_after_deref: Null-checking this->logger suggests that it may be
 null, but it has already been dereferenced on all paths leading to the
 check.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 2dd320aef9b..3428feb1bb7 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3361,9 +3361,11 @@ void Monitor::remove_all_sessions()
   while (!session_map.sessions.empty()) {
     MonSession *s = session_map.sessions.front();
     remove_session(s);
-    logger->inc(l_mon_session_rm);
+    if (logger)
+      logger->inc(l_mon_session_rm);
   }
-  logger->set(l_mon_num_sessions, session_map.get_size());
+  if (logger)
+    logger->set(l_mon_num_sessions, session_map.get_size());
 }
 
 void Monitor::send_command(const entity_inst_t& inst,