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

Fixes: ceph#8286 Signed-off-by: Brad Hubbard <[email protected]>
siplabs · Mar 11, 2016 · 7663b9f · 7663b9f
1 parent 4fdd10d
commit 7663b9f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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) {