tools: add catches for C++ exceptions

diff --git a/src/grey.cpp b/src/grey.cpp
index fa8da2b494d502009e71067d3e472842a91bdd29..86a93d25aaecdbb53bd719d6754733ae6d37ce65 100644 (file)
--- a/src/grey.cpp
+++ b/src/grey.cpp
@@ -198,7 +198,15 @@ void applyGreyOverrides(Grey *g, const string &s) {
 
         string::const_iterator ve = find(ke, pe, ';');
 
-        unsigned int value = lexical_cast<unsigned int>(string(ke + 1, ve));
+        unsigned int value = 0;
+        try {
+            value = lexical_cast<unsigned int>(string(ke + 1, ve));
+        } catch (boost::bad_lexical_cast &e) {
+            printf("Invalid grey override key %s:%s\n", key.c_str(),
+                   string(ke + 1, ve).c_str());
+            invalid_key_seen = true;
+            break;
+        }
         bool done = false;
 
         /* surely there exists a nice template to go with this macro to make

diff --git a/tools/hsbench/main.cpp b/tools/hsbench/main.cpp
index fecdd3305e1e058adfa3192db3957a0164070dcc..de9fde07d98b3086cbd657e62b72e210589ec856 100644 (file)
--- a/tools/hsbench/main.cpp
+++ b/tools/hsbench/main.cpp
@@ -1065,6 +1065,9 @@ int HS_CDECL main(int argc, char *argv[]) {
     } catch (const SqlFailure &f) {
         cerr << f.message << '\n';
         return -1;
+    } catch (const std::runtime_error &e) {
+        cerr << "Internal error: " << e.what() << '\n';
+        return -1;
     }
 
     return 0;