crushtool: Don't crash when called on a file that isn't a crushmap

Fixes: #8286
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>

diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc
index 5d2d542066a69b2be9c2a601d110c6bb89536c22..7e0438972c59782a5935608aafa50ccc3193bbff 100644 (file)
--- a/src/tools/crushtool.cc
+++ b/src/tools/crushtool.cc
@@ -583,7 +583,12 @@ int main(int argc, const char **argv)
       }
     }
     bufferlist::iterator p = bl.begin();
-    crush.decode(p);
+    try {
+      crush.decode(p);
+    } catch(...) {
+      cerr << me << ": unable to decode " << infn << std::endl;
+      exit(EXIT_FAILURE);
+    }
   }
 
   if (compile) {