zeroc-ice 3.8.0 → 3.8.2

data/dist/ice/cpp/include/generated/Ice/Metrics.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Metrics.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -217,7 +217,7 @@ namespace IceMX
         /// @param[out] timestamp The local time of the process when the metrics objects were retrieved.
         /// @param context The request context.
         /// @return The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
-        /// The @p timestamp allows the client to compute averages which are not dependent of the invocation latency for
+        /// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
         /// this operation.
         /// @throws IceMX::UnknownMetricsView Thrown when the metrics view cannot be found.
         MetricsView getMetricsView(std::string_view view, std::int64_t& timestamp, const Ice::Context& context = Ice::noExplicitContext) const;
@@ -227,7 +227,7 @@ namespace IceMX
         /// @param context The request context.
         /// @return A future that becomes available when the invocation completes. This future holds:
         /// - `returnValue` The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
-        /// The @p timestamp allows the client to compute averages which are not dependent of the invocation latency for
+        /// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
         /// this operation.
         /// - `timestamp` The local time of the process when the metrics objects were retrieved.
         [[nodiscard]] std::future<std::tuple<MetricsView, std::int64_t>> getMetricsViewAsync(std::string_view view, const Ice::Context& context = Ice::noExplicitContext) const;
@@ -236,7 +236,7 @@ namespace IceMX
         /// @param view The name of the metrics view.
         /// @param response The response callback. It accepts:
         /// - `returnValue` The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
-        /// The @p timestamp allows the client to compute averages which are not dependent of the invocation latency for
+        /// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
         /// this operation.
         /// - `timestamp` The local time of the process when the metrics objects were retrieved.
         /// @param exception The exception callback.
@@ -929,7 +929,7 @@ namespace IceMX
         /// @param[out] timestamp The local time of the process when the metrics objects were retrieved.
         /// @param current The Current object of the incoming request.
         /// @return The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
-        /// The @p timestamp allows the client to compute averages which are not dependent of the invocation latency for
+        /// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
         /// this operation.
         /// @throws IceMX::UnknownMetricsView Thrown when the metrics view cannot be found.
         virtual MetricsView getMetricsView(std::string view, std::int64_t& timestamp, const Ice::Current& current) = 0;
@@ -1027,7 +1027,7 @@ namespace IceMX
         /// @param view The name of the metrics view.
         /// @param response The response callback. It accepts:
         /// - `returnValue` The metrics view data, a dictionary of metric maps for each metrics class configured with the view.
-        /// The @p timestamp allows the client to compute averages which are not dependent of the invocation latency for
+        /// The `timestamp` allows the client to compute averages which are not dependent on the invocation latency for
         /// this operation.
         /// - `timestamp` The local time of the process when the metrics objects were retrieved.
         /// @param exception The exception callback.

data/dist/ice/cpp/include/generated/Ice/OperationMode.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'OperationMode.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/Process.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Process.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/PropertiesAdmin.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'PropertiesAdmin.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/PropertyDict.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'PropertyDict.ice'.</auto-generated>
 // clang-format off
 
@@ -19,7 +19,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/RemoteLogger.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'RemoteLogger.ice'.</auto-generated>
 // clang-format off
 
@@ -19,7 +19,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/ReplyStatus.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'ReplyStatus.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -63,7 +63,11 @@ namespace Ice
         InvalidData = 8,
 
         /// The caller is not authorized to access the requested resource.
-        Unauthorized = 9
+        Unauthorized = 9,
+
+        /// The dispatch failed because the request requires a feature that the server or the target servant does not
+        /// support.
+        NotSupported = 10
     };
 
     /// Outputs the enumerator name or underlying value of a ReplyStatus to a stream.
@@ -81,7 +85,7 @@ namespace Ice
     {
         static constexpr StreamHelperCategory helper = StreamHelperCategoryEnum;
         static constexpr int minValue = 0;
-        static constexpr int maxValue = 9;
+        static constexpr int maxValue = 10;
         static constexpr int minWireSize = 1;
         static constexpr bool fixedLength = false;
     };

data/dist/ice/cpp/include/generated/Ice/Router.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Router.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -83,7 +83,7 @@ namespace Ice
         /// router. If a null proxy is returned, the client will forward requests to the router's endpoints.
         /// @param[out] hasRoutingTable Indicates whether or not the router supports a routing table. If `true`, the Ice
         /// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
-        /// a routing table when @p hasRoutingTable is not set.
+        /// a routing table when `hasRoutingTable` is not set.
         /// @param context The request context.
         /// @return The router's client proxy.
         /// @remarks Introduced in Ice 3.7.
@@ -96,7 +96,7 @@ namespace Ice
         /// - `returnValue` The router's client proxy.
         /// - `hasRoutingTable` Indicates whether or not the router supports a routing table. If `true`, the Ice
         /// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
-        /// a routing table when @p hasRoutingTable is not set.
+        /// a routing table when `hasRoutingTable` is not set.
         /// @remarks Introduced in Ice 3.7.
         [[nodiscard]] std::future<std::tuple<std::optional<Ice::ObjectPrx>, std::optional<bool>>> getClientProxyAsync(const Ice::Context& context = Ice::noExplicitContext) const;
 
@@ -106,7 +106,7 @@ namespace Ice
         /// - `returnValue` The router's client proxy.
         /// - `hasRoutingTable` Indicates whether or not the router supports a routing table. If `true`, the Ice
         /// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
-        /// a routing table when @p hasRoutingTable is not set.
+        /// a routing table when `hasRoutingTable` is not set.
         /// @param exception The exception callback.
         /// @param sent The sent callback.
         /// @param context The request context.
@@ -307,7 +307,7 @@ namespace Ice
         /// router. If a null proxy is returned, the client will forward requests to the router's endpoints.
         /// @param[out] hasRoutingTable Indicates whether or not the router supports a routing table. If `true`, the Ice
         /// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
-        /// a routing table when @p hasRoutingTable is not set.
+        /// a routing table when `hasRoutingTable` is not set.
         /// @param current The Current object of the incoming request.
         /// @return The router's client proxy.
         /// @remarks Introduced in Ice 3.7.
@@ -409,7 +409,7 @@ namespace Ice
         /// - `returnValue` The router's client proxy.
         /// - `hasRoutingTable` Indicates whether or not the router supports a routing table. If `true`, the Ice
         /// runtime will call ::Ice::RouterPrx::addProxies to populate the routing table. The Ice runtime assumes the router has
-        /// a routing table when @p hasRoutingTable is not set.
+        /// a routing table when `hasRoutingTable` is not set.
         /// @param exception The exception callback.
         /// @param current The Current object of the incoming request.
         /// @remarks Introduced in Ice 3.7.

data/dist/ice/cpp/include/generated/Ice/SliceChecksumDict.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'SliceChecksumDict.ice'.</auto-generated>
 // clang-format off
 
@@ -17,7 +17,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/Ice/Version.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Version.ice'.</auto-generated>
 // clang-format off
 
@@ -20,7 +20,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/IceDiscovery/Lookup.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Lookup.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/dist/ice/cpp/include/generated/IceLocatorDiscovery/Lookup.h

@@ -1,6 +1,6 @@
 // Copyright (c) ZeroC, Inc.
 
-// slice2cpp version 3.8.0
+// slice2cpp version 3.8.2
 // <auto-generated>Generated from Slice file 'Lookup.ice'.</auto-generated>
 // clang-format off
 
@@ -18,7 +18,7 @@
 #   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 0
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -107,13 +107,15 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
             //
             outAsync->cancelable(shared_from_this());
 
+            auto outAsyncPtr = outAsync->shared_from_this();
+
             if (_response)
             {
                 requestId = ++_requestId;
-                _asyncRequests.insert(make_pair(requestId, outAsync->shared_from_this()));
+                _asyncRequests.insert(make_pair(requestId, outAsyncPtr));
             }
 
-            _sendAsyncRequests.insert(make_pair(outAsync->shared_from_this(), requestId));
+            _sendAsyncRequests.insert(make_pair(outAsyncPtr, requestId));
         }
 
         OutputStream* os = outAsync->getOs();
@@ -348,7 +350,7 @@ CollocatedRequestHandler::sendResponse(OutgoingResponse response)
                     is.swap(*q->second->getIs());
                     if (q->second->response())
                     {
-                        outAsync = q->second;
+                        outAsync = std::move(q->second);
                     }
                     _asyncRequests.erase(q);
                 }

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

@@ -88,11 +88,11 @@ namespace IceInternal
                 std::function<void(Ice::ConnectionIPtr, bool)>,
                 std::function<void(std::exception_ptr)>);
 
-            virtual void connectionStartCompleted(const Ice::ConnectionIPtr&);
-            virtual void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
+            void connectionStartCompleted(const Ice::ConnectionIPtr&);
+            void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
 
-            virtual void connectors(const std::vector<ConnectorPtr>&);
-            virtual void exception(std::exception_ptr);
+            void connectors(const std::vector<ConnectorPtr>&);
+            void exception(std::exception_ptr);
 
             void getConnectors();
             void nextEndpoint();
@@ -193,8 +193,8 @@ namespace IceInternal
         //
 
 #if defined(ICE_USE_IOCP)
-        virtual bool startAsync(SocketOperation);
-        virtual bool finishAsync(SocketOperation);
+        bool startAsync(SocketOperation) final;
+        bool finishAsync(SocketOperation) final;
 #endif
 
         void message(ThreadPoolCurrent&) override;
@@ -205,8 +205,8 @@ namespace IceInternal
         [[nodiscard]] std::string toString() const override;
         NativeInfoPtr getNativeInfo() override;
 
-        virtual void connectionStartCompleted(const Ice::ConnectionIPtr&);
-        virtual void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
+        void connectionStartCompleted(const Ice::ConnectionIPtr&);
+        void connectionStartFailed(const Ice::ConnectionIPtr&, std::exception_ptr);
         void initialize();
         ~IncomingConnectionFactory() override;
 

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

@@ -12,7 +12,8 @@
 #include "Ice/Properties.h"
 #include "IdleTimeoutTransceiverDecorator.h"
 #include "Instance.h"
-#include "ObjectAdapterI.h"   // For getThreadPool()
+#include "ObjectAdapterI.h" // For getThreadPool()
+#include "OutgoingResponseInternal.h"
 #include "ReferenceFactory.h" // For createProxy().
 #include "RequestHandler.h"   // For RetryException
 #include "ThreadPool.h"
@@ -118,7 +119,7 @@ namespace
     string createBadMagicMessage(const byte m[])
     {
         ostringstream os;
-        os << "bag magic in message header: ";
+        os << "bad magic in message header: ";
         for (size_t i = 0; i < sizeof(magic); ++i)
         {
             os << hex << setw(2) << setfill('0') << static_cast<int>(m[i]) << ' ';
@@ -1012,7 +1013,7 @@ Ice::ConnectionI::setAdapter(const ObjectAdapterPtr& adapter)
     {
         // Go through the adapter to set the adapter on this connection
         // to ensure the object adapter is still active.
-        dynamic_pointer_cast<ObjectAdapterI>(adapter)->setAdapterOnConnection(shared_from_this());
+        static_pointer_cast<ObjectAdapterI>(adapter)->setAdapterOnConnection(shared_from_this());
     }
     else
     {
@@ -2717,7 +2718,7 @@ Ice::ConnectionI::sendNextMessages(vector<OutgoingMessage>& callbacks)
                 _writeStream.swap(*message->stream);
                 if (message->sent())
                 {
-                    callbacks.push_back(*message);
+                    callbacks.push_back(std::move(*message));
                 }
             }
             _sendStreams.pop_front();
@@ -2850,7 +2851,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
     // message was queued.
     if (!_sendStreams.empty())
     {
-        _sendStreams.push_back(message);
+        _sendStreams.push_back(std::move(message));
         _sendStreams.back().adopt(nullptr);
         return AsyncStatusQueued;
     }
@@ -2895,7 +2896,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
             return status;
         }
 
-        _sendStreams.push_back(message);
+        _sendStreams.push_back(std::move(message));
         _sendStreams.back().adopt(&stream);
     }
     else
@@ -2945,7 +2946,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
             return status;
         }
 
-        _sendStreams.push_back(message);
+        _sendStreams.push_back(std::move(message));
         _sendStreams.back().adopt(nullptr); // Adopt the stream.
 #ifdef ICE_HAS_BZIP2
     }
@@ -3254,13 +3255,28 @@ Ice::ConnectionI::parseMessage(int32_t& upcallCount, function<bool(InputStream&)
                     stream.read(requestCount);
                     if (requestCount < 0)
                     {
-                        requestCount = 0;
                         throw MarshalException{
                             __FILE__,
                             __LINE__,
                             "received batch request with " + to_string(requestCount) + " batches"};
                     }
 
+                    // A batched request occupies at least 12 bytes on the wire (a 2-byte identity, a
+                    // 1-byte facet path, a 1-byte operation name, a 1-byte operation mode, a 1-byte
+                    // context, and a 6-byte parameters encapsulation). Reject a count larger than the
+                    // remaining message data could possibly hold. The message size is already capped
+                    // at Ice.MessageSizeMax (<= INT32_MAX bytes), so this also keeps requestCount well
+                    // within range when it is accumulated into the dispatch counters below.
+                    constexpr int32_t minBatchRequestSize = 12;
+                    if (requestCount > (stream.b.end() - stream.i) / minBatchRequestSize)
+                    {
+                        throw MarshalException{
+                            __FILE__,
+                            __LINE__,
+                            "received batch request with " + to_string(requestCount) +
+                                " batches, more than the message can contain"};
+                    }
+
                     upcall = [self = shared_from_this(), requestCount, adapter, compress](InputStream& messageStream)
                     {
                         self->dispatchAll(messageStream, requestCount, requestId, compress, adapter);
@@ -3298,7 +3314,7 @@ Ice::ConnectionI::parseMessage(int32_t& upcallCount, function<bool(InputStream&)
 
                 if (q != _asyncRequests.end())
                 {
-                    auto outAsync = q->second;
+                    auto outAsync = std::move(q->second);
 
                     if (q == _asyncRequestsHint)
                     {
@@ -3438,9 +3454,10 @@ Ice::ConnectionI::dispatchAll(
             {
                 // Received request on a connection without an object adapter.
                 sendResponse(
-                    makeOutgoingResponse(
+                    makeOutgoingResponseCore(
                         make_exception_ptr(ObjectNotExistException{__FILE__, __LINE__}),
-                        request.current()),
+                        request.current(),
+                        _instance.get()),
                     0);
             }
 

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

@@ -72,7 +72,7 @@ namespace Ice
     public:
         std::shared_ptr<ConnectionI> shared_from_this()
         {
-            return std::dynamic_pointer_cast<ConnectionI>(IceInternal::EventHandler::shared_from_this());
+            return std::static_pointer_cast<ConnectionI>(IceInternal::EventHandler::shared_from_this());
         }
 
         struct OutgoingMessage

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

@@ -3,6 +3,7 @@
 #include "Ice/Demangle.h"
 
 #if defined(__GNUC__) || defined(__clang__)
+#    include <cstdlib>
 #    include <cxxabi.h>
 #endif
 

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

@@ -195,34 +195,6 @@ IceInternal::mkdir(const string& path, int)
     return ::_wmkdir(stringToWstring(path, Ice::getProcessStringConverter()).c_str());
 }
 
-FILE*
-IceInternal::fopen(const string& path, const string& mode)
-{
-    //
-    // Don't need to use a wide string converter, the wide strings are directly passed
-    // to Windows API.
-    //
-    const Ice::StringConverterPtr converter = Ice::getProcessStringConverter();
-    return ::_wfopen(stringToWstring(path, converter).c_str(), stringToWstring(mode, converter).c_str());
-}
-
-int
-IceInternal::open(const string& path, int flags)
-{
-    //
-    // Don't need to use a wide string converter, the wide string is directly passed
-    // to Windows API.
-    //
-    if (flags & _O_CREAT)
-    {
-        return ::_wopen(stringToWstring(path, Ice::getProcessStringConverter()).c_str(), flags, _S_IREAD | _S_IWRITE);
-    }
-    else
-    {
-        return ::_wopen(stringToWstring(path, Ice::getProcessStringConverter()).c_str(), flags);
-    }
-}
-
 int
 IceInternal::getcwd(string& cwd)
 {
@@ -249,16 +221,6 @@ IceInternal::unlink(const string& path)
     return _wunlink(stringToWstring(path, Ice::getProcessStringConverter()).c_str());
 }
 
-int
-IceInternal::close(int fd)
-{
-#    ifdef _WIN32
-    return _close(fd);
-#    else
-    return ::close(fd);
-#    endif
-}
-
 IceInternal::FileLock::FileLock(const std::string& path) : _path(path)
 {
     //
@@ -351,26 +313,6 @@ IceInternal::mkdir(const string& path, int perm)
     return ::mkdir(path.c_str(), static_cast<mode_t>(perm));
 }
 
-FILE*
-IceInternal::fopen(const string& path, const string& mode)
-{
-    return ::fopen(path.c_str(), mode.c_str());
-}
-
-int
-IceInternal::open(const string& path, int flags)
-{
-    if (flags & O_CREAT)
-    {
-        // By default, create with rw-rw-rw- modified by the user's umask (same as fopen).
-        return ::open(path.c_str(), flags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
-    }
-    else
-    {
-        return ::open(path.c_str(), flags);
-    }
-}
-
 int
 IceInternal::getcwd(string& cwd)
 {
@@ -389,15 +331,9 @@ IceInternal::unlink(const string& path)
     return ::unlink(path.c_str());
 }
 
-int
-IceInternal::close(int fd)
-{
-    return ::close(fd);
-}
-
 IceInternal::FileLock::FileLock(const std::string& path) : _path(path)
 {
-    _fd = ::open(path.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+    _fd = ::open(path.c_str(), O_RDWR | O_CREAT | O_NOFOLLOW, S_IRUSR | S_IWUSR);
     if (_fd < 0)
     {
         throw FileLockException(__FILE__, __LINE__, errno, _path);
@@ -417,7 +353,7 @@ IceInternal::FileLock::FileLock(const std::string& path) : _path(path)
     if (::fcntl(_fd, F_SETLK, &lock) == -1)
     {
         int err = errno;
-        close(_fd);
+        ::close(_fd);
         throw FileLockException(__FILE__, __LINE__, err, _path);
     }
 
@@ -436,7 +372,7 @@ IceInternal::FileLock::FileLock(const std::string& path) : _path(path)
     if (write(_fd, os.str().c_str(), os.str().size()) == -1)
     {
         int err = errno;
-        close(_fd);
+        ::close(_fd);
         throw FileLockException(__FILE__, __LINE__, err, _path);
     }
 }

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

@@ -84,13 +84,10 @@ namespace IceInternal
     ICE_API int rmdir(const std::string&);
 
     ICE_API int mkdir(const std::string&, int);
-    ICE_API FILE* fopen(const std::string&, const std::string&);
     ICE_API FILE* freopen(const std::string&, const std::string&, FILE*);
-    ICE_API int open(const std::string&, int);
     ICE_API int getcwd(std::string&);
 
     ICE_API int unlink(const std::string&);
-    ICE_API int close(int);
 
     //
     // This class is used to implement process file locking. This class

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

@@ -419,6 +419,10 @@ IceInternal::IPEndpointI::IPEndpointI(ProtocolInstancePtr instance, InputStream*
     s->read(const_cast<string&>(_host), false);
     const_cast<string&>(_normalizedHost) = normalizeIPv6Address(_host);
     s->read(const_cast<int32_t&>(_port));
+    if (_port < 0 || _port > 65535)
+    {
+        throw MarshalException{__FILE__, __LINE__, "port value '" + to_string(_port) + "' is out of range"};
+    }
 }
 
 IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& instance)