handle error in error log (#422)

* do not allow exceptions to leak from Sentry error reporting or SentryAssertImpl::OnAssert

1 files changed, 46 insertions, 15 deletions

diff --git a/src/zenserver/zenserver.cpp b/src/zenserver/zenserver.cpp
index c36e20b30..40a797c21 100644
--- a/src/zenserver/zenserver.cpp
+++ b/src/zenserver/zenserver.cpp
@@ -161,13 +161,31 @@ namespace utils {
 
 		void sink_it_(const spdlog::details::log_msg& msg) override
 		{
-			std::string	   Message = fmt::format("{}\n{}({}) [{}]", msg.payload, msg.source.filename, msg.source.line, msg.source.funcname);
-			sentry_value_t event   = sentry_value_new_message_event(
-				  /*   level */ MapToSentryLevel[msg.level],
-				  /*  logger */ nullptr,
-				  /* message */ Message.c_str());
-			sentry_event_value_add_stacktrace(event, NULL, 0);
-			sentry_capture_event(event);
+			try
+			{
+				std::string Message =
+					fmt::format("{}\n{}({}) [{}]", msg.payload, msg.source.filename, msg.source.line, msg.source.funcname);
+				sentry_value_t event = sentry_value_new_message_event(
+					/*   level */ MapToSentryLevel[msg.level],
+					/*  logger */ nullptr,
+					/* message */ Message.c_str());
+				sentry_event_value_add_stacktrace(event, NULL, 0);
+				sentry_capture_event(event);
+			}
+			catch (std::exception&)
+			{
+				// If our logging with Message formatting fails we do a non-allocating version and just post the msg.payload raw
+				char   TmpBuffer[256];
+				size_t MaxCopy = Min<size_t>(msg.payload.size(), size_t(255));
+				memcpy(TmpBuffer, msg.payload.data(), MaxCopy);
+				TmpBuffer[MaxCopy]	 = '\0';
+				sentry_value_t event = sentry_value_new_message_event(
+					/*   level */ SENTRY_LEVEL_ERROR,
+					/*  logger */ nullptr,
+					/* message */ TmpBuffer);
+				sentry_event_value_add_stacktrace(event, NULL, 0);
+				sentry_capture_event(event);
+			}
 		}
 		void flush_() override {}
 	};
@@ -181,13 +199,26 @@ namespace utils {
 																  const char* FunctionName,
 																  const char* Msg)
 		{
-			std::string	   Message = fmt::format("ASSERT {}:({}) [{}]\n\"{}\"", Filename, LineNumber, FunctionName, Msg);
-			sentry_value_t event   = sentry_value_new_message_event(
-				  /*   level */ SENTRY_LEVEL_ERROR,
-				  /*  logger */ nullptr,
-				  /* message */ Message.c_str());
-			sentry_event_value_add_stacktrace(event, NULL, 0);
-			sentry_capture_event(event);
+			try
+			{
+				std::string	   Message = fmt::format("ASSERT {}:({}) [{}]\n\"{}\"", Filename, LineNumber, FunctionName, Msg);
+				sentry_value_t event   = sentry_value_new_message_event(
+					  /*   level */ SENTRY_LEVEL_ERROR,
+					  /*  logger */ nullptr,
+					  /* message */ Message.c_str());
+				sentry_event_value_add_stacktrace(event, NULL, 0);
+				sentry_capture_event(event);
+			}
+			catch (std::exception&)
+			{
+				// If our logging with Message formatting fails we do a non-allocating version and just post the Msg raw
+				sentry_value_t event = sentry_value_new_message_event(
+					/*   level */ SENTRY_LEVEL_ERROR,
+					/*  logger */ nullptr,
+					/* message */ Msg);
+				sentry_event_value_add_stacktrace(event, NULL, 0);
+				sentry_capture_event(event);
+			}
 		}
 		AssertImpl* PrevAssertImpl;
 	};
@@ -1193,8 +1224,8 @@ ZenEntryPoint::Run()
 	auto _ = zen::MakeGuard([&SentryAssert, SentryErrorCode] {
 		if (SentryErrorCode == 0)
 		{
-			SentryAssert.reset();
 			zen::logging::SetErrorLog(std::shared_ptr<spdlog::logger>());
+			SentryAssert.reset();
 			sentry_close();
 		}
 	});