From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Thu, 25 Aug 2011 00:19:41 +0000 (-0700)
Subject: MonClient: fix possible null dereference
X-Git-Tag: v0.35~224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5fb216e05a98c9b113d870e665c1a99e1fd183e5;p=ceph.git

MonClient: fix possible null dereference

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 2c90481c362e..b595cb576a9c 100644
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -245,7 +245,8 @@ int MonClient::get_monmap_privately()
   if (temp_msgr) {
     monc_lock.Unlock();
     messenger->shutdown();
-    smessenger->wait();
+    if (smessenger)
+      smessenger->wait();
     messenger->destroy();
     messenger = 0;
     monc_lock.Lock();