]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
MetricCollector.h: Add check to prevent mgr from crashing 43446/head
authorAswin Toni <aswin.toni@cern.ch>
Fri, 1 Oct 2021 14:12:22 +0000 (16:12 +0200)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Mon, 22 Nov 2021 16:27:51 +0000 (23:27 +0700)
Fixes: https://tracker.ceph.com/issues/52801
Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 9a05872fdd499575961ee1a8d188d19054841eb8)

src/mgr/MetricCollector.h

index f74787e96a9eeb9e01af23202f87ec8c4197327c..c4588f780b07a1a18571e53da288a56d7570b48b 100644 (file)
@@ -44,7 +44,9 @@ public:
       auto result_it = result.insert({query, {}}).first;
       if (is_limited(limits)) {
         for (auto& limit : limits) {
-          result_it->second.insert(*limit.second);
+          if (limit.second) {
+            result_it->second.insert(*limit.second);
+          }
         }
       }
     }