From ef336075cf932d7de6ca18f4db6abde9c75443a3 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Feb 2019 12:14:13 -0600
Subject: [PATCH] mgr/PyModuleRegistry: avoid null deref from
 get_progress_events

active_modules may be null.

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/mgr/PyModuleRegistry.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
-- 
2.47.3