]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
MetricCollector.h: Add check to prevent mgr from crashing 43445/head
authorAswin Toni <aswin.toni@cern.ch>
Fri, 1 Oct 2021 14:12:22 +0000 (16:12 +0200)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Thu, 7 Oct 2021 08:44:26 +0000 (15:44 +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 19a3eed9b0aba5b4053f2c7017580329b17b262e..65e71e276e4326ee537d576d3783018f52a8d5a4 100644 (file)
@@ -42,7 +42,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);
+          }
         }
       }
     }