From acd845f8ba0f409c5ba56d54a04ae7988367a49e Mon Sep 17 00:00:00 2001
From: Mykola Golub <mykola.golub@clyso.com>
Date: Wed, 29 Sep 2021 10:30:56 +0300
Subject: [PATCH] tools/osdmaptool: fix possible segfaults when there are down
 osds

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
(cherry picked from commit 3cc453705f4b16a0f232c62b32848929b3be8aac)
---
 src/tools/osdmaptool.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc
index 9bbe40f4d16..8d1a38f4b36 100644
--- a/src/tools/osdmaptool.cc
+++ b/src/tools/osdmaptool.cc
@@ -684,9 +684,10 @@ skip_upmap:
 
 	for (unsigned i=0; i<osds.size(); i++) {
 	  //cout << " rep " << i << " on " << osds[i] << std::endl;
-	  count[osds[i]]++;
+          if (osds[i] != CRUSH_ITEM_NONE)
+            count[osds[i]]++;
 	}
-	if (osds.size())
+	if (osds.size() && osds[0] != CRUSH_ITEM_NONE)
 	  first_count[osds[0]]++;
 	if (primary >= 0)
 	  primary_count[primary]++;
-- 
2.47.3