Also catch exceptions not derived from std::exception

foxglove · Apr 27, 2023 · 16d34c0 · 16d34c0
1 parent 1fc7ba0
commit 16d34c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/foxglove_bridge_base/include/foxglove_bridge/callback_queue.hpp b/foxglove_bridge_base/include/foxglove_bridge/callback_queue.hpp
@@ -63,6 +63,8 @@ class CallbackQueue {
           const std::string msg =
             std::string("Caught unhandled exception in calback_queue") + ex.what();
           _logCallback(WebSocketLogLevel::Error, msg.c_str());
+        } catch (...) {
+          _logCallback(WebSocketLogLevel::Error, "Caught unhandled exception in calback_queue");
         }
       }
     }

diff --git a/foxglove_bridge_base/include/foxglove_bridge/websocket_server.hpp b/foxglove_bridge_base/include/foxglove_bridge/websocket_server.hpp
@@ -561,6 +561,9 @@ inline void Server<ServerConfiguration>::handleMessage(ConnHandle hdl, MessagePt
             handleTextMessage(hdl, msg);
           } catch (const std::exception& e) {
             sendStatusAndLogMsg(hdl, StatusLevel::Error, e.what());
+          } catch (...) {
+            sendStatusAndLogMsg(hdl, StatusLevel::Error,
+                                "Exception occurred when executing text message handler");
           }
         });
       } break;
@@ -570,6 +573,9 @@ inline void Server<ServerConfiguration>::handleMessage(ConnHandle hdl, MessagePt
             handleBinaryMessage(hdl, msg);
           } catch (const std::exception& e) {
             sendStatusAndLogMsg(hdl, StatusLevel::Error, e.what());
+          } catch (...) {
+            sendStatusAndLogMsg(hdl, StatusLevel::Error,
+                                "Exception occurred when executing binary message handler");
           }
         });
       } break;