(logging-log4cxx) branch master updated: Replace manual exception message buffers with std::string (#661)

[swebb2066]

This is an automated email from the ASF dual-hosted git repository.

swebb2066 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git


The following commit(s) were added to refs/heads/master by this push:
     new f14bc95d Replace manual exception message buffers with std::string 
(#661)
f14bc95d is described below

commit f14bc95def3e2822553a61c53d3e92447e915641
Author: metsw24-max <mets...@gmail.com>
AuthorDate: Wed May 13 06:44:58 2026 +0530

    Replace manual exception message buffers with std::string (#661)
---
 src/main/cpp/exception.cpp                   | 37 ++++------------------------
 src/main/include/log4cxx/helpers/exception.h | 16 ++++++------
 2 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/src/main/cpp/exception.cpp b/src/main/cpp/exception.cpp
index 0ccbd3d8..e0edabdc 100644
--- a/src/main/cpp/exception.cpp
+++ b/src/main/cpp/exception.cpp
@@ -29,56 +29,29 @@ using namespace LOG4CXX_NS::helpers;
 Exception::Exception(const LogString& msg1)
 {
        LOG4CXX_ENCODE_CHAR(m, msg1);
-       size_t len = m.size();
-
-       if (len > MSG_SIZE)
-       {
-               len = MSG_SIZE;
-       }
-
-#if defined(__STDC_LIB_EXT1__) || defined(__STDC_SECURE_LIB__)
-       memcpy_s(msg, sizeof msg, m.data(), len);
-#else
-       memcpy(msg, m.data(), len);
-#endif
-       msg[len] = 0;
+       msg = m;
 }
 
 Exception::Exception(const char* m)
 {
-#if defined(__STDC_LIB_EXT1__) || defined(__STDC_SECURE_LIB__)
-       strncpy_s(msg, sizeof msg, m, MSG_SIZE);
-#else
-       strncpy(msg, m, MSG_SIZE);
-#endif
-       msg[MSG_SIZE] = 0;
+       msg = (m ? std::string(m) : std::string());
 }
 
 
 Exception::Exception(const Exception& src) : std::exception()
 {
-#if defined(__STDC_LIB_EXT1__) || defined(__STDC_SECURE_LIB__)
-       strcpy_s(msg, sizeof msg, src.msg);
-#else
-       strncpy(msg, src.msg, MSG_SIZE);
-       msg[MSG_SIZE] = 0;
-#endif
+       msg = src.msg;
 }
 
 Exception& Exception::operator=(const Exception& src)
 {
-#if defined(__STDC_LIB_EXT1__) || defined(__STDC_SECURE_LIB__)
-       strcpy_s(msg, sizeof msg, src.msg);
-#else
-       strncpy(msg, src.msg, MSG_SIZE);
-       msg[MSG_SIZE] = 0;
-#endif
+       msg = src.msg;
        return *this;
 }
 
 const char* Exception::what() const throw()
 {
-       return msg;
+       return msg.c_str();
 }
 
 RuntimeException::RuntimeException(log4cxx_status_t stat)
diff --git a/src/main/include/log4cxx/helpers/exception.h 
b/src/main/include/log4cxx/helpers/exception.h
index 6460ef74..143e00c0 100644
--- a/src/main/include/log4cxx/helpers/exception.h
+++ b/src/main/include/log4cxx/helpers/exception.h
@@ -21,6 +21,7 @@
 #include <exception>
 #include <log4cxx/log4cxx.h>
 #include <log4cxx/logstring.h>
+#include <string>
 
 #ifdef _MSC_VER
        #pragma warning ( push )
@@ -47,8 +48,7 @@ class LOG4CXX_EXPORT Exception : public ::std::exception
                static std::string makeMessage(const char* type, 
log4cxx_status_t stat);
 #endif
        private:
-               enum { MSG_SIZE = 128 };
-               char msg[MSG_SIZE + 1];
+               std::string msg;
 }; // class Exception
 
 /** RuntimeException is the parent class of those exceptions that can be
@@ -97,14 +97,14 @@ class LOG4CXX_EXPORT IOException : public Exception
                IOException(log4cxx_status_t stat);
                IOException(const LogString& msg);
                IOException(const char* msg);
-               IOException(const LogString& type, log4cxx_status_t stat);
+       IOException(const LogString& type, log4cxx_status_t stat);
 #if !LOG4CXX_LOGCHAR_IS_UTF8
-               IOException(const char* msg, log4cxx_status_t stat);
+       IOException(const char* msg, log4cxx_status_t stat);
 #endif
-               IOException(const IOException& src);
-               IOException& operator=(const IOException&);
-       private:
-               static LogString formatMessage(log4cxx_status_t stat);
+       IOException(const IOException& src);
+       IOException& operator=(const IOException&);
+    private:
+       static LogString formatMessage(log4cxx_status_t stat);
 };
 
 class LOG4CXX_EXPORT MissingResourceException : public Exception