Bug 3996 - slice compilers can terminate on uncaught exceptions

1 files changed, 38 insertions, 1 deletions

diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index 8ba2400f060..34ad5f8dd4a 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -1477,7 +1477,7 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co
 }
 
 int
-main(int argc, char* argv[])
+compile(int argc, char* argv[])
 {
     IceUtilInternal::Options opts;
     opts.addOpt("h", "help");
@@ -2023,3 +2023,40 @@ main(int argc, char* argv[])
 
     return status;
 }
+
+int
+main(int argc, char* argv[])
+{
+    try
+    {
+        return compile(argc, argv);
+    }
+    catch(const IceUtil::Exception& ex)
+    {
+        cerr << ex.what() << endl;
+#ifdef __GNUC__
+        cerr << ex.ice_stackTrace() << endl;
+#endif
+        return EXIT_FAILURE;
+    }
+    catch(const std::exception& ex)
+    {
+        cerr << ex.what() << endl;
+        return EXIT_FAILURE;
+    }
+    catch(const std::string& msg)
+    {
+        cerr << msg << endl;
+        return EXIT_FAILURE;
+    }
+    catch(const char* msg)
+    {
+        cerr << msg << endl;
+        return EXIT_FAILURE;
+    }
+    catch(...)
+    {
+        cerr << "unknown exception" << endl;
+        return EXIT_FAILURE;
+    }
+}