zeroc-ice 3.8.1 → 3.8.3

data/dist/ice/cpp/src/Ice/Service.cpp

@@ -11,7 +11,9 @@
 #    include <winsock2.h>
 #else
 #    include "Network.h"
+#    include <algorithm>
 #    include <csignal>
+#    include <sys/resource.h>
 #    include <sys/stat.h>
 #    include <sys/types.h>
 #    ifdef ICE_USE_SYSTEMD
@@ -172,93 +174,6 @@ namespace
             DeregisterEventSource(_source);
         }
 
-        static void addKeys(const string& source, const StringConverterPtr& stringConverter)
-        {
-            HKEY hKey;
-            DWORD d;
-            //
-            // Don't need to use a wide string converter as the wide string is passed
-            // to Windows API.
-            //
-            LSTATUS err = RegCreateKeyExW(
-                HKEY_LOCAL_MACHINE,
-                stringToWstring(createKey(source), stringConverter).c_str(),
-                0,
-                const_cast<wchar_t*>(L"REG_SZ"),
-                REG_OPTION_NON_VOLATILE,
-                KEY_ALL_ACCESS,
-                0,
-                &hKey,
-                &d);
-
-            if (err != ERROR_SUCCESS)
-            {
-                throw SyscallException{__FILE__, __LINE__, "RegCreateKeyExW failed", static_cast<DWORD>(err)};
-            }
-
-            //
-            // Get the filename of this DLL.
-            //
-            wchar_t path[_MAX_PATH];
-            assert(_module != 0);
-            if (!GetModuleFileNameW(_module, path, _MAX_PATH))
-            {
-                DWORD error = GetLastError();
-                RegCloseKey(hKey);
-                throw SyscallException{__FILE__, __LINE__, "GetModuleFileNameW failed", error};
-            }
-
-            //
-            // The event resources are bundled into this DLL, therefore
-            // the "EventMessageFile" key should contain the path to this
-            // DLL.
-            //
-            err = RegSetValueExW(
-                hKey,
-                L"EventMessageFile",
-                0,
-                REG_EXPAND_SZ,
-                reinterpret_cast<unsigned char*>(path),
-                static_cast<DWORD>((wcslen(path) * sizeof(wchar_t)) + 1));
-
-            if (err == ERROR_SUCCESS)
-            {
-                //
-                // The "TypesSupported" key indicates the supported event
-                // types.
-                //
-                DWORD typesSupported = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE;
-                err = RegSetValueExW(
-                    hKey,
-                    L"TypesSupported",
-                    0,
-                    REG_DWORD,
-                    reinterpret_cast<unsigned char*>(&typesSupported),
-                    sizeof(typesSupported));
-            }
-            if (err != ERROR_SUCCESS)
-            {
-                RegCloseKey(hKey);
-                throw SyscallException{__FILE__, __LINE__, "RegSetValueExW failed", static_cast<DWORD>(err)};
-            }
-
-            RegCloseKey(hKey);
-        }
-
-        static void removeKeys(const string& source, const StringConverterPtr& stringConverter)
-        {
-            //
-            // Don't need to use a wide string converter as the wide string is passed
-            // to Windows API.
-            //
-            LSTATUS err =
-                RegDeleteKeyW(HKEY_LOCAL_MACHINE, stringToWstring(createKey(source), stringConverter).c_str());
-            if (err != ERROR_SUCCESS)
-            {
-                throw SyscallException{__FILE__, __LINE__, "RegDeleteKeyW failed", static_cast<DWORD>(err)};
-            }
-        }
-
         virtual void print(const string& prefix, const string& message)
         {
             string s;
@@ -379,8 +294,6 @@ namespace
             ReportEventW(_source, EVENTLOG_ERROR_TYPE, 0, EVENT_LOGGER_MSG, 0, 1, 0, messages, 0);
         }
 
-        static void setModuleHandle(HMODULE module) { _module = module; }
-
     private:
         static string mangleSource(string name)
         {
@@ -395,22 +308,9 @@ namespace
             return name;
         }
 
-        static string createKey(string name)
-        {
-            //
-            // The registry key is:
-            //
-            // HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog\Application.
-            //
-            return "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\" + mangleSource(name);
-        }
-
         StringConverterPtr _stringConverter;
         HANDLE _source;
-        static HMODULE _module;
     };
-
-    HMODULE SMEventLoggerI::_module = 0;
 }
 
 #endif
@@ -425,6 +325,7 @@ Ice::Service::~Service()
 {
     _instance = nullptr;
     delete ctrlCHandler;
+    ctrlCHandler = nullptr;
 }
 
 bool
@@ -816,12 +717,6 @@ Ice::Service::configureService(const string& name)
     _name = name;
 }
 
-void
-Ice::Service::setModuleHandle(HMODULE module)
-{
-    SMEventLoggerI::setModuleHandle(module);
-}
-
 #else
 
 void
@@ -1385,7 +1280,10 @@ ServiceStatusManager::stopUpdate()
         }
     }
 
-    thread.join();
+    if (thread.joinable())
+    {
+        thread.join();
+    }
 }
 
 void
@@ -1469,7 +1367,8 @@ Ice::Service::runDaemon(int argc, char* argv[], InitializationData initData)
         char c = 0;
         while (true)
         {
-            if (read(fds[0], &c, 1) == -1)
+            ssize_t rc = read(fds[0], &c, 1);
+            if (rc == -1)
             {
                 if (IceInternal::interrupted())
                 {
@@ -1483,6 +1382,20 @@ Ice::Service::runDaemon(int argc, char* argv[], InitializationData initData)
                 consoleErr << IceInternal::errorToString(errno) << endl;
                 _exit(EXIT_FAILURE);
             }
+            else if (rc == 0)
+            {
+                //
+                // EOF before the readiness byte: the daemon exited during startup without signaling readiness
+                // (e.g. it was killed by a signal or aborted in a plug-in). Report a failure so supervisors don't
+                // conclude the service started successfully.
+                //
+                if (argv[0])
+                {
+                    consoleErr << argv[0] << ": ";
+                }
+                consoleErr << "daemon exited during startup before signaling readiness" << endl;
+                _exit(EXIT_FAILURE);
+            }
             break;
         }
 
@@ -1494,7 +1407,7 @@ Ice::Service::runDaemon(int argc, char* argv[], InitializationData initData)
             ssize_t rs;
             char s[16];
             string message;
-            while ((rs = read(fds[0], &s, 16)) > 0)
+            while ((rs = read(fds[0], s, sizeof(s))) > 0)
             {
                 message.append(s, static_cast<size_t>(rs));
             }
@@ -1579,13 +1492,18 @@ Ice::Service::runDaemon(int argc, char* argv[], InitializationData initData)
             // have an opportunity to use stdin/stdout/stderr if necessary. This also
             // conveniently allows the Ice.PrintProcessId property to work as expected.
             //
-            int fdMax = static_cast<int>(sysconf(_SC_OPEN_MAX));
-            if (fdMax <= 0)
+            // Bound the probe loop by the soft RLIMIT_NOFILE — the kernel never allocates a
+            // descriptor at or above it — capped so the loop stays cheap even with a very large
+            // limit (such as LimitNOFILE=infinity under systemd).
+            //
+            rlim_t fdMax = 1 << 20;
+            rlimit fdLimit{};
+            if (getrlimit(RLIMIT_NOFILE, &fdLimit) == 0)
             {
-                throw SyscallException{__FILE__, __LINE__, "sysconf failed", errno};
+                fdMax = std::min(fdMax, fdLimit.rlim_cur);
             }
 
-            for (int i = 0; i < fdMax; ++i)
+            for (int i = 0; i < static_cast<int>(fdMax); ++i)
             {
                 if (fcntl(i, F_GETFL) != -1)
                 {

data/dist/ice/cpp/src/Ice/StreamSocket.cpp

@@ -10,7 +10,8 @@ StreamSocket::StreamSocket(
     ProtocolInstancePtr instance,
     const NetworkProxyPtr& proxy,
     const Address& addr,
-    const Address& sourceAddr)
+    const Address& sourceAddr,
+    const TcpBufSize& bufSize)
     : NativeInfo(createSocket(false, proxy ? proxy->getAddress() : addr)),
       _instance(std::move(instance)),
       _proxy(proxy),
@@ -23,25 +24,17 @@ StreamSocket::StreamSocket(
       _write(SocketOperationWrite)
 #endif
 {
-    init();
+    init(bufSize);
 #if !defined(ICE_USE_IOCP)
     if (doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr))
     {
         _state = _proxy ? StateProxyWrite : StateConnected;
     }
 #endif
-    try
-    {
-        _desc = fdToString(_fd, _proxy, _addr);
-    }
-    catch (const Ice::Exception&)
-    {
-        closeSocketNoThrow(_fd);
-        throw;
-    }
+    _desc = fdToString(_fd, _proxy, _addr);
 }
 
-StreamSocket::StreamSocket(ProtocolInstancePtr instance, SOCKET fd)
+StreamSocket::StreamSocket(ProtocolInstancePtr instance, SOCKET fd, const TcpBufSize& bufSize)
     : NativeInfo(fd),
       _instance(std::move(instance)),
       _addr(),
@@ -53,16 +46,8 @@ StreamSocket::StreamSocket(ProtocolInstancePtr instance, SOCKET fd)
       _write(SocketOperationWrite)
 #endif
 {
-    init();
-    try
-    {
-        _desc = fdToString(fd);
-    }
-    catch (const Ice::Exception&)
-    {
-        closeSocketNoThrow(fd);
-        throw;
-    }
+    init(bufSize);
+    _desc = fdToString(fd);
 }
 
 StreamSocket::~StreamSocket() { assert(_fd == INVALID_SOCKET); }
@@ -113,16 +98,19 @@ StreamSocket::connect(Buffer& readBuffer, Buffer& writeBuffer)
     return IceInternal::SocketOperationNone;
 }
 
-bool
-StreamSocket::isConnected()
-{
-    return _state == StateConnected && _fd != INVALID_SOCKET;
-}
-
 void
 StreamSocket::setBufferSize(int rcvSize, int sndSize)
 {
-    setTcpBufSize(_fd, rcvSize, sndSize, _instance);
+    try
+    {
+        setTcpBufSize(_fd, rcvSize, sndSize, _instance);
+    }
+    catch (const Ice::SocketException&)
+    {
+        // The failing call closed the fd.
+        clearFd();
+        throw;
+    }
 }
 
 SocketOperation
@@ -431,16 +419,19 @@ StreamSocket::finishRead(Buffer& buf)
 void
 StreamSocket::close()
 {
-    assert(_fd != INVALID_SOCKET);
-    try
+    // _fd can be INVALID_SOCKET when a failed socket operation already closed the fd.
+    if (_fd != INVALID_SOCKET)
     {
-        closeSocket(_fd);
-        _fd = INVALID_SOCKET;
-    }
-    catch (const Ice::SocketException&)
-    {
-        _fd = INVALID_SOCKET;
-        throw;
+        try
+        {
+            closeSocket(_fd);
+            _fd = INVALID_SOCKET;
+        }
+        catch (const Ice::SocketException&)
+        {
+            _fd = INVALID_SOCKET;
+            throw;
+        }
     }
 }
 
@@ -451,10 +442,12 @@ StreamSocket::toString() const
 }
 
 void
-StreamSocket::init()
+StreamSocket::init(const TcpBufSize& bufSize)
 {
+    // Both calls close the fd before throwing a SocketException, so a failure cannot leak the fd — and since init
+    // is only called from constructors, the exception abandons the object and nothing uses the stale _fd afterward.
     setBlock(_fd, false);
-    setTcpBufSize(_fd, _instance);
+    setTcpBufSize(_fd, bufSize.rcvSize(), bufSize.sndSize(), _instance);
 }
 
 StreamSocket::State

data/dist/ice/cpp/src/Ice/StreamSocket.h

@@ -6,6 +6,7 @@
 #include "Ice/Buffer.h"
 #include "Network.h"
 #include "ProtocolInstanceF.h"
+#include "TcpBufSize.h"
 
 #include <memory>
 
@@ -14,12 +15,11 @@ namespace IceInternal
     class StreamSocket : public NativeInfo
     {
     public:
-        StreamSocket(ProtocolInstancePtr, const NetworkProxyPtr&, const Address&, const Address&);
-        StreamSocket(ProtocolInstancePtr, SOCKET);
+        StreamSocket(ProtocolInstancePtr, const NetworkProxyPtr&, const Address&, const Address&, const TcpBufSize&);
+        StreamSocket(ProtocolInstancePtr, SOCKET, const TcpBufSize&);
         ~StreamSocket() override;
 
         SocketOperation connect(Buffer&, Buffer&);
-        bool isConnected();
 
         void setBufferSize(int rcvSize, int sndSize);
 
@@ -41,7 +41,7 @@ namespace IceInternal
         [[nodiscard]] const std::string& toString() const;
 
     private:
-        void init();
+        void init(const TcpBufSize&);
 
         enum State
         {

data/dist/ice/cpp/src/Ice/StringConverter.cpp

@@ -483,7 +483,7 @@ namespace
         wstring wbuffer;
 
         //
-        // The following code pages doesn't support MB_ERR_INVALID_CHARS flag
+        // The following code pages don't support the MB_ERR_INVALID_CHARS flag
         // see http://msdn.microsoft.com/en-us/library/windows/desktop/dd319072(v=vs.85).aspx
         //
         DWORD flags = (_cp == 50220 || _cp == 50221 || _cp == 50222 || _cp == 50225 || _cp == 50227 || _cp == 50229 ||

data/dist/ice/cpp/src/Ice/StringUtil.cpp

@@ -337,6 +337,7 @@ namespace
     // end marks the one-past-the-end position of the substring to be scanned.
     // nextStart is set to the index of the first character following the decoded
     // character or escape sequence.
+    // Returns true if the decoded character is pure ASCII (<= 127), false otherwise.
     //
     bool decodeChar(
         const string& s,
@@ -353,6 +354,10 @@ namespace
 
         if (s[start] != '\\')
         {
+            if (static_cast<unsigned char>(s[start]) > 127)
+            {
+                pureASCII = false;
+            }
             result.push_back(checkChar(s, start++));
         }
         else if (start + 1 == end)
@@ -585,7 +590,7 @@ IceInternal::unescapeString(
         {
             checkChar(s, p++);
         }
-        return s.substr(start, end);
+        return s.substr(start, end - start);
     }
     else
     {
@@ -605,7 +610,7 @@ IceInternal::unescapeString(
 
             if (!inputIsPureASCII)
             {
-                u8s = nativeToUTF8(s.substr(start, end), stringConverter);
+                u8s = nativeToUTF8(s.substr(start, end - start), stringConverter);
                 inputStringPtr = &u8s;
                 start = 0;
                 end = u8s.size();
@@ -617,7 +622,7 @@ IceInternal::unescapeString(
         result.reserve(end - start);
         while (start < end)
         {
-            if (decodeChar(*inputStringPtr, start, end, start, special, result))
+            if (!decodeChar(*inputStringPtr, start, end, start, special, result))
             {
                 resultIsPureASCII = false;
             }
@@ -801,7 +806,7 @@ IceInternal::match(const string& s, const string& pat, bool emptyMatch)
     //
     // Make sure end of the strings match
     //
-    if (s.substr(endIndex, s.length()) != pat.substr(beginIndex + 1, pat.length()))
+    if (s.substr(endIndex) != pat.substr(beginIndex + 1))
     {
         return false;
     }
@@ -1032,10 +1037,10 @@ IceInternal::errorToString(int error)
         //
         // Use the XSI-compliant version of strerror_r
         //
-        int err = strerror_r(error, &buffer[0], buffer.size());
+        int err = strerror_r(error, buffer.data(), buffer.size());
         if (err == 0)
         {
-            return {&buffer[0]};
+            return {buffer.data()};
         }
 #    else
         //
@@ -1043,7 +1048,7 @@ IceInternal::errorToString(int error)
         //
         int oerrno = errno;
         errno = 0;
-        const char* msg = strerror_r(error, &buffer[0], buffer.size());
+        const char* msg = strerror_r(error, buffer.data(), buffer.size());
         int err = errno;
         errno = oerrno;
         if (err == 0)
@@ -1121,17 +1126,3 @@ IceInternal::isDigit(char c)
 {
     return c >= '0' && c <= '9';
 }
-
-string
-IceInternal::removeWhitespace(string_view s)
-{
-    string result;
-    for (unsigned int i = 0; i < s.length(); ++i)
-    {
-        if (!isspace(static_cast<unsigned char>(s[i])))
-        {
-            result += s[i];
-        }
-    }
-    return result;
-}