(logging-log4cxx) branch master updated: Prevent SonarCloud failure (#525)

[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 f5665127 Prevent SonarCloud failure (#525)
f5665127 is described below

commit f5665127812c85581ebf927d6ba9c814eef3f587
Author: Stephen Webb <stephen.w...@ieee.org>
AuthorDate: Wed Aug 20 16:37:10 2025 +1000

    Prevent SonarCloud failure (#525)
---
 src/main/cpp/system.cpp | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/main/cpp/system.cpp b/src/main/cpp/system.cpp
index 423c0136..49c6be81 100644
--- a/src/main/cpp/system.cpp
+++ b/src/main/cpp/system.cpp
@@ -23,6 +23,7 @@
 #include <log4cxx/helpers/pool.h>
 #include <log4cxx/helpers/properties.h>
 #include <log4cxx/helpers/loglog.h>
+#include <log4cxx/helpers/stringhelper.h>
 #include <apr_file_io.h>
 #include <apr_user.h>
 #include <apr_env.h>
@@ -136,18 +137,36 @@ void System::addProgramFilePathComponents(Properties& 
props)
        // Find the executable file name
        static const int bufSize = 4096;
        char buf[bufSize+1] = {0}, pathSepar = '/';
-       uint32_t bufCount = 0;
 #if defined(_WIN32)
-       GetModuleFileName(NULL, buf, bufSize);
+       if (0 == GetModuleFileName(NULL, buf, bufSize))
+       {
+               Pool p;
+               LogString lsErrorCode;
+               StringHelper::toString((int)GetLastError(), p, lsErrorCode);
+               LogLog::warn(LOG4CXX_STR("GetModuleFileName error ") + 
lsErrorCode);
+               return;
+       }
        pathSepar = '\\';
 #elif defined(__APPLE__)
-       bufCount = bufSize;
-       _NSGetExecutablePath(buf, &bufCount);
+       uint32_t bufCount = bufSize;
+       if (0 != _NSGetExecutablePath(buf, &bufCount))
+       {
+               LogLog::warn(LOG4CXX_STR("_NSGetExecutablePath failed"));
+               return;
+       }
 #elif (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE >= 500) || 
(defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L)
+       int bufCount = 0;
        std::ostringstream exeLink;
        exeLink << "/proc/" << getpid() << "/exe";
-       bufCount = readlink(exeLink.str().c_str(), buf, bufSize);
-       if (0 < bufCount)
+       if ((bufCount = readlink(exeLink.str().c_str(), buf, bufSize)) <= 0)
+       {
+               LOG4CXX_DECODE_CHAR(lsExeLink, exeLink.str());
+               LogLog::warn(LOG4CXX_STR("Failed to read ") + lsExeLink);
+               return;
+       }
+       if (bufSize < bufCount)
+               buf[bufSize] = 0;
+       else
                buf[bufCount] = 0;
 #else
        LogLog::warn(LOG4CXX_STR("Unable to determine the name of the 
executable file on this system"));