]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
MonClient: fix possible null dereference
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 25 Aug 2011 00:19:41 +0000 (17:19 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Thu, 25 Aug 2011 00:20:35 +0000 (17:20 -0700)
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
src/mon/MonClient.cc

index 2c90481c362ef8e089393a6276fac400c47f0a9a..b595cb576a9c95cecc093e61c1994a37c9d54fdf 100644 (file)
@@ -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();