]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/PyModuleRegistry: avoid null deref from get_progress_events 26456/head
authorSage Weil <sage@redhat.com>
Fri, 15 Feb 2019 18:14:13 +0000 (12:14 -0600)
committerSage Weil <sage@redhat.com>
Fri, 15 Feb 2019 18:14:13 +0000 (12:14 -0600)
active_modules may be null.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/PyModuleRegistry.h

index 743efc333f720fda7a27e2fd9946a40b4e2acafb..0e46af44e6e4af9fe245e45d9e3ce4546aad1bf6 100644 (file)
@@ -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