From 51b2fc3a6c81a2886e1b23a7fb959f35f9e42546 Mon Sep 17 00:00:00 2001
From: ohadmeir <ohad1.meir@intel.com>
Date: Wed, 13 Mar 2024 15:24:01 +0200
Subject: [PATCH] Fix Coverity issues - catch exceptions in tools

---
 tools/benchmark/rs-benchmark.cpp                | 10 ++++++++++
 .../enumerate-devices/rs-enumerate-devices.cpp  | 10 ++++++++++
 tools/fw-logger/rs-fw-logger.cpp                | 17 ++++++++++++++++-
 tools/fw-update/rs-fw-update.cpp                | 10 ++++++++++
 tools/rosbag-inspector/rs-rosbag-inspector.cpp  | 12 +++++++++++-
 tools/terminal/rs-terminal.cpp                  | 17 ++++++++++++++++-
 6 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/tools/benchmark/rs-benchmark.cpp b/tools/benchmark/rs-benchmark.cpp
index 9635ddb776..e056d7df6a 100644
--- a/tools/benchmark/rs-benchmark.cpp
+++ b/tools/benchmark/rs-benchmark.cpp
@@ -378,3 +378,13 @@ catch (const error & e)
     cerr << "RealSense error calling " << e.get_failed_function() << "(" << e.get_failed_args() << "):\n    " << e.what() << endl;
     return EXIT_FAILURE;
 }
+catch( const exception & e )
+{
+    cerr << e.what() << endl;
+    return EXIT_FAILURE;
+}
+catch( ... )
+{
+    cerr << "some error" << endl;
+    return EXIT_FAILURE;
+}
diff --git a/tools/enumerate-devices/rs-enumerate-devices.cpp b/tools/enumerate-devices/rs-enumerate-devices.cpp
index 4b44338386..1d32c8b802 100644
--- a/tools/enumerate-devices/rs-enumerate-devices.cpp
+++ b/tools/enumerate-devices/rs-enumerate-devices.cpp
@@ -713,3 +713,13 @@ catch (const error & e)
     cerr << "RealSense error calling " << e.get_failed_function() << "(" << e.get_failed_args() << "):\n    " << e.what() << endl;
     return EXIT_FAILURE;
 }
+catch( const exception & e )
+{
+    cerr << e.what() << endl;
+    return EXIT_FAILURE;
+}
+catch( ... )
+{
+    cerr << "some error" << endl;
+    return EXIT_FAILURE;
+}
diff --git a/tools/fw-logger/rs-fw-logger.cpp b/tools/fw-logger/rs-fw-logger.cpp
index 42eccb09e5..ecb805c0c7 100644
--- a/tools/fw-logger/rs-fw-logger.cpp
+++ b/tools/fw-logger/rs-fw-logger.cpp
@@ -25,7 +25,7 @@ string datetime_string()
     return string(buffer);
 }
 
-int main(int argc, char* argv[])
+int main(int argc, char* argv[]) try
 {
     int default_polling_interval_ms = 100;
     CmdLine cmd("librealsense rs-fw-logger example tool", ' ', RS2_API_FULL_VERSION_STR);
@@ -191,3 +191,18 @@ int main(int argc, char* argv[])
 
     return EXIT_SUCCESS;
 }
+catch( const rs2::error & e )
+{
+    cerr << "RealSense error calling " << e.get_failed_function() << "(" << e.get_failed_args() << "):\n    " << e.what() << endl;
+    return EXIT_FAILURE;
+}
+catch( const exception & e )
+{
+    cerr << e.what() << endl;
+    return EXIT_FAILURE;
+}
+catch( ... )
+{
+    cerr << "some error" << endl;
+    return EXIT_FAILURE;
+}
diff --git a/tools/fw-update/rs-fw-update.cpp b/tools/fw-update/rs-fw-update.cpp
index d29f5d211a..4e397e786f 100644
--- a/tools/fw-update/rs-fw-update.cpp
+++ b/tools/fw-update/rs-fw-update.cpp
@@ -606,3 +606,13 @@ catch (const rs2::error & e)
     std::cerr << "RealSense error calling " << e.get_failed_function() << "(" << e.get_failed_args() << "):\n    " << e.what() << std::endl;
     return EXIT_FAILURE;
 }
+catch( const std::exception & e )
+{
+    std::cerr << e.what() << std::endl;
+    return EXIT_FAILURE;
+}
+catch( ... )
+{
+    std::cerr << "some error" << std::endl;
+    return EXIT_FAILURE;
+}
diff --git a/tools/rosbag-inspector/rs-rosbag-inspector.cpp b/tools/rosbag-inspector/rs-rosbag-inspector.cpp
index c229f7f4d6..584bebf97a 100644
--- a/tools/rosbag-inspector/rs-rosbag-inspector.cpp
+++ b/tools/rosbag-inspector/rs-rosbag-inspector.cpp
@@ -388,7 +388,7 @@ inline void sort(sort_type m_sort_type, const std::string& in, const std::string
     }
 }
 
-int main(int argc, const char** argv)
+int main(int argc, const char** argv) try
 {
     if (!glfwInit())
     {
@@ -437,6 +437,16 @@ int main(int argc, const char** argv)
     glfwTerminate();
     return 0;
 }
+catch( const std::exception & e )
+{
+    std::cerr << e.what() << std::endl;
+    return EXIT_FAILURE;
+}
+catch( ... )
+{
+    std::cerr << "some error" << std::endl;
+    return EXIT_FAILURE;
+}
 
 #ifdef WIN32
 int CALLBACK WinMain(
diff --git a/tools/terminal/rs-terminal.cpp b/tools/terminal/rs-terminal.cpp
index af281a5059..42702538a5 100644
--- a/tools/terminal/rs-terminal.cpp
+++ b/tools/terminal/rs-terminal.cpp
@@ -163,7 +163,7 @@ rs2::device wait_for_device(const rs2::device_hub& hub, bool print_info = true)
     return dev;
 }
 
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
 {
     CmdLine cmd("librealsense rs-terminal tool", ' ', RS2_API_FULL_VERSION_STR);
     SwitchArg debug_arg( "", "debug", "Turn on LibRS debug logs" );
@@ -470,3 +470,18 @@ int main(int argc, char** argv)
 
     }
 }
+catch( const rs2::error & e )
+{
+    cerr << "RealSense error calling " << e.get_failed_function() << "(" << e.get_failed_args() << "):\n    " << e.what() << endl;
+    return EXIT_FAILURE;
+}
+catch( const exception & e )
+{
+    cerr << e.what() << endl;
+    return EXIT_FAILURE;
+}
+catch( ... )
+{
+    cerr << "some error" << endl;
+    return EXIT_FAILURE;
+}