Produce a proper error message when catching a std::runtime_error at top level

tautschnig · tautschnig · commit 2ae66c2b328d · 2018-04-25T14:40:03.000Z
diff --git a/src/cbmc/bmc.cpp b/src/cbmc/bmc.cpp
@@ -705,10 +705,10 @@ int bmct::do_language_agnostic_bmc(
     message.error() << error_msg << message.eom;
     return CPROVER_EXIT_EXCEPTION;
   }
-  catch(...)
+  catch(std::runtime_error &e)
   {
-    message.error() << "unable to get solver" << message.eom;
-    throw std::current_exception();
+    message.error() << e.what() << message.eom;
+    return CPROVER_EXIT_EXCEPTION;
   }
 
   switch(result)

Original file line number	Diff line number	Diff line change
`@@ -705,10 +705,10 @@ int bmct::do_language_agnostic_bmc(`
`705`	`705`	`message.error() << error_msg << message.eom;`
`706`	`706`	`return CPROVER_EXIT_EXCEPTION;`
`707`	`707`	`}`
`708`		`- catch(...)`
	`708`	`+ catch(std::runtime_error &e)`
`709`	`709`	`{`
`710`		`- message.error() << "unable to get solver" << message.eom;`
`711`		`- throw std::current_exception();`
	`710`	`+ message.error() << e.what() << message.eom;`
	`711`	`+ return CPROVER_EXIT_EXCEPTION;`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`switch(result)`