From e3480136bd832ec501975d74839d4fd0044d1bd8 Mon Sep 17 00:00:00 2001
From: zhlinh <zhlinhng@gmail.com>
Date: Fri, 23 Aug 2024 16:49:55 +0800
Subject: [PATCH 1/2] fix: WriteNoFormat add null check

---
 mars/comm/xlogger/xlogger.h                | 16 ++++++++++++----
 mars/xlog/export_include/xlogger/xlogger.h | 16 ++++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/mars/comm/xlogger/xlogger.h b/mars/comm/xlogger/xlogger.h
index bcf57686b..557e6495c 100644
--- a/mars/comm/xlogger/xlogger.h
+++ b/mars/comm/xlogger/xlogger.h
@@ -101,7 +101,9 @@ class XMessage {
 #endif
     XMessage&
     WriteNoFormat(const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 #ifdef __GNUC__
@@ -109,7 +111,9 @@ class XMessage {
 #endif
     XMessage&
     WriteNoFormat(const TypeSafeFormat&, const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 
@@ -197,7 +201,9 @@ class XLogger {
 #endif
     XLogger&
     WriteNoFormat(const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 #ifdef __GNUC__
@@ -205,7 +211,9 @@ class XLogger {
 #endif
     XLogger&
     WriteNoFormat(const TypeSafeFormat&, const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 
diff --git a/mars/xlog/export_include/xlogger/xlogger.h b/mars/xlog/export_include/xlogger/xlogger.h
index 7ad578bba..aa691838a 100644
--- a/mars/xlog/export_include/xlogger/xlogger.h
+++ b/mars/xlog/export_include/xlogger/xlogger.h
@@ -84,7 +84,9 @@ class XMessage {
 #endif
     XMessage&
     WriteNoFormat(const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 #ifdef __GNUC__
@@ -92,7 +94,9 @@ class XMessage {
 #endif
     XMessage&
     WriteNoFormat(const TypeSafeFormat&, const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 
@@ -204,7 +208,9 @@ class XLogger {
 #endif
     XLogger&
     WriteNoFormat(const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 #ifdef __GNUC__
@@ -212,7 +218,9 @@ class XLogger {
 #endif
     XLogger&
     WriteNoFormat(const TypeSafeFormat&, const char* _log) {
-        m_message += _log;
+        if (_log) {
+            m_message += _log;
+        }
         return *this;
     }
 

From 9ed43f56af61e6b8a022ee994e0b5bb78bb45aa1 Mon Sep 17 00:00:00 2001
From: zhlinh <zhlinhng@gmail.com>
Date: Fri, 23 Aug 2024 20:53:07 +0800
Subject: [PATCH 2/2] fix: Appender::Write add null check

---
 mars/xlog/src/appender.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mars/xlog/src/appender.cc b/mars/xlog/src/appender.cc
index 3da89cd9d..889f2287a 100644
--- a/mars/xlog/src/appender.cc
+++ b/mars/xlog/src/appender.cc
@@ -201,7 +201,7 @@ void XloggerAppender::Write(const XLoggerInfo* _info, const char* _log) {
         PtrBuffer tmp((void*)recursion_str.data(), 0, kMaxDumpLength);
         log_formater(&info, recursive_log, tmp);
 
-        if (recursion_str.capacity() >= strnlen(_log, kMaxDumpLength)) {
+        if (_log && recursion_str.capacity() >= strnlen(_log, kMaxDumpLength)) {
             recursion_str += _log;
         }