From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Feb 2019 18:14:13 +0000 (-0600)
Subject: mgr/PyModuleRegistry: avoid null deref from get_progress_events
X-Git-Tag: v14.1.0~95^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26456%2Fhead;p=ceph.git

mgr/PyModuleRegistry: avoid null deref from get_progress_events

active_modules may be null.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/PyModuleRegistry.h b/src/mgr/PyModuleRegistry.h
index 743efc333f72..0e46af44e6e4 100644
--- a/src/mgr/PyModuleRegistry.h
+++ b/src/mgr/PyModuleRegistry.h
@@ -151,7 +151,9 @@ public:
   void get_health_checks(health_check_map_t *checks);
 
   void get_progress_events(map<std::string,ProgressEvent> *events) {
-    return active_modules->get_progress_events(events);
+    if (active_modules) {
+      active_modules->get_progress_events(events);
+    }
   }
 
   // FIXME: breaking interface so that I don't have to go rewrite all