Defend against exceptions during logging, e.g. CipherException if filename decrypt fails.

1 files changed, 18 insertions, 2 deletions

diff --git a/lib/server/makeprotocol.pl.in b/lib/server/makeprotocol.pl.in
index 95dd84fd..27a82959 100755
--- a/lib/server/makeprotocol.pl.in
+++ b/lib/server/makeprotocol.pl.in
@@ -469,12 +469,28 @@ __E
 	print CPP <<__E;
 void $cmd_class\::LogSysLog(const char *Action) const
 {
-	BOX_TRACE($log);
+	try
+	{
+		BOX_TRACE($log);
+	}
+	catch(std::exception &e)
+	{
+		BOX_WARNING("Failed to log command: " << Action << ": " <<
+			e.what());
+	}
 }
 void $cmd_class\::LogFile(const char *Action, FILE *File) const
 {
 	std::ostringstream oss;
-	oss << $log;
+	try
+	{
+		oss << $log;
+	}
+	catch(std::exception &e)
+	{
+		oss << "Failed to log command: " << Action << ": " <<
+			e.what();
+	}
 	::fprintf(File, "%s\\n", oss.str().c_str());
 	::fflush(File);
 }