zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/IceUtil/RecMutex.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Exception.h>
@@ -113,7 +108,7 @@ IceUtil::RecMutex::lock(LockState& state) const
 #else
 
 void
-IceUtil::RecMutex::init(const MutexProtocol protocol)
+IceUtil::RecMutex::init(ICE_MAYBE_UNUSED const MutexProtocol protocol)
 {
     int rc;
     pthread_mutexattr_t attr;
@@ -125,11 +120,7 @@ IceUtil::RecMutex::init(const MutexProtocol protocol)
         throw ThreadSyscallException(__FILE__, __LINE__, rc);
     }
 
-#if defined(__linux) && !defined(__USE_UNIX98)
-    rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#else
     rc = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-#endif
     assert(rc == 0);
     if(rc != 0)
     {

data/ext/ice/cpp/src/IceUtil/Shared.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Shared.h>
 

data/ext/ice/cpp/src/IceUtil/StringConverter.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringConverter.h>
 #include <IceUtil/MutexPtrLock.h>
@@ -97,7 +92,7 @@ public:
         do
         {
             assert(factor <= 4);
-            const size_t chunkSize = std::max<size_t>((sourceEnd - sourceStart) * factor, 4);
+            const size_t chunkSize = std::max<size_t>(static_cast<size_t>(sourceEnd - sourceStart) * factor, 4);
             ++factor; // at the next round, we'll allocate more bytes per remaining source character
 
             targetStart = reinterpret_cast<char*>(buffer.getMoreBytes(chunkSize, reinterpret_cast<Byte*>(targetNext)));
@@ -150,7 +145,7 @@ public:
 
     virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd, wstring& target) const
     {
-        const size_t sourceSize = sourceEnd - sourceStart;
+        const size_t sourceSize = static_cast<size_t>(sourceEnd - sourceStart);
 
         if(sourceSize == 0)
         {
@@ -178,7 +173,7 @@ public:
                 throw IllegalConversionException(__FILE__, __LINE__, "codecvt.in failure");
             }
 
-            target.resize(targetNext - targetStart);
+            target.resize(static_cast<size_t>(targetNext - targetStart));
         }
     }
 
@@ -280,7 +275,7 @@ public:
         size_t bytesUsed = 0;
         if(firstUnused != 0)
         {
-            bytesUsed = firstUnused - reinterpret_cast<const Byte*>(_buffer.data());
+            bytesUsed = static_cast<size_t>(firstUnused - reinterpret_cast<const Byte*>(_buffer.data()));
         }
 
         if(_buffer.size() < howMany + bytesUsed)
@@ -294,7 +289,7 @@ public:
     void swap(string& other, const Byte* tail)
     {
         assert(tail >= reinterpret_cast<const Byte*>(_buffer.data()));
-        _buffer.resize(tail - reinterpret_cast<const Byte*>(_buffer.data()));
+        _buffer.resize(static_cast<size_t>(tail - reinterpret_cast<const Byte*>(_buffer.data())));
         other.swap(_buffer);
     }
 

data/ext/ice/cpp/src/IceUtil/StringUtil.cpp

@@ -1,16 +1,13 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/StringConverter.h>
 #include <cstring>
+#include <string.h> // for strerror_r
 
+#include <sstream>
 #include <iomanip>
 
 using namespace std;
@@ -25,11 +22,11 @@ toHexDigit(Byte b)
     assert(b < 16);
     if(b < 10)
     {
-        return '0' + b;
+        return static_cast<char>('0' + b);
     }
     else
     {
-        return 'a' - 10 + b;
+        return static_cast<char>('a' - 10 + b);
     }
 }
 
@@ -292,7 +289,7 @@ checkChar(const string& s, string::size_type pos)
         ostr << " has invalid ordinal value " << static_cast<int>(c);
         throw IllegalArgumentException(__FILE__, __LINE__, ostr.str());
     }
-    return c;
+    return static_cast<char>(c);
 }
 
 //
@@ -1071,7 +1068,43 @@ IceUtilInternal::lastErrorToString()
 string
 IceUtilInternal::errorToString(int error)
 {
-    return strerror(error);
+    vector<char> buffer(500);
+    while(true)
+    {
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !_GNU_SOURCE)
+        //
+        // Use the XSI-compliant version of strerror_r
+        //
+        int err = strerror_r(error, &buffer[0], buffer.size());
+        if(err == 0)
+        {
+            return string(&buffer[0]);
+        }
+#else
+        //
+        // Use the GNU-specific version of strerror_r
+        //
+        int oerrno = errno;
+        errno = 0;
+        const char* msg = strerror_r(error, &buffer[0], buffer.size());
+        int err = errno;
+        errno = oerrno;
+        if(err == 0)
+        {
+            return msg;
+        }
+#endif
+        if(err == ERANGE && buffer.size() < 1024 * 1024)
+        {
+            buffer.resize(buffer.size() * 2);
+        }
+        else
+        {
+            ostringstream os;
+            os << "Unknown error `" << error << "'";
+            return os.str();
+        }
+    }
 }
 
 string
@@ -1091,7 +1124,7 @@ IceUtilInternal::toLower(const std::string& s)
     {
         if(isascii(s[i]))
         {
-            result += tolower(static_cast<unsigned char>(s[i]));
+            result += static_cast<char>(tolower(static_cast<unsigned char>(s[i])));
         }
         else
         {
@@ -1110,7 +1143,7 @@ IceUtilInternal::toUpper(const std::string& s)
     {
         if(isascii(s[i]))
         {
-            result += toupper(static_cast<unsigned char>(s[i]));
+            result += static_cast<char>(toupper(static_cast<unsigned char>(s[i])));
         }
         else
         {

data/ext/ice/cpp/src/IceUtil/ThreadException.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/ThreadException.h>
 

data/ext/ice/cpp/src/IceUtil/Time.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <IceUtil/Exception.h>
@@ -102,7 +97,7 @@ IceUtil::Time::now(Clock clock)
         struct timeb tb;
         ftime(&tb);
 #  endif
-        return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000);
+        return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + Int64(tb.millitm) * 1000);
 #else
         struct timeval tv;
         if(gettimeofday(&tv, 0) < 0)
@@ -135,7 +130,7 @@ IceUtil::Time::now(Clock clock)
             struct timeb tb;
             ftime(&tb);
 #  endif
-            return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + tb.millitm * 1000);
+            return Time(static_cast<Int64>(tb.time) * ICE_INT64(1000000) + Int64(tb.millitm) * 1000);
         }
 #elif defined(__hppa)
         //
@@ -149,7 +144,7 @@ IceUtil::Time::now(Clock clock)
         }
         return Time(tv.tv_sec * ICE_INT64(1000000) + tv.tv_usec);
 #elif defined(__APPLE__)
-       return Time(mach_absolute_time() * machMultiplier);
+        return Time(static_cast<IceUtil::Int64>(mach_absolute_time() * machMultiplier));
 #else
         struct timespec ts;
         if(clock_gettime(CLOCK_MONOTONIC, &ts) < 0)
@@ -202,8 +197,8 @@ IceUtil::Time::microSecondsDouble(double t)
 IceUtil::Time::operator timeval() const
 {
     timeval tv;
-    tv.tv_sec = static_cast<long>(_usec / 1000000);
-    tv.tv_usec = static_cast<long>(_usec % 1000000);
+    tv.tv_sec = static_cast<time_t>(_usec / 1000000);
+    tv.tv_usec = static_cast<suseconds_t>(_usec % 1000000);
     return tv;
 }
 #endif
@@ -285,17 +280,15 @@ IceUtil::Time::toString(const std::string& format) const
 {
     time_t time = static_cast<long>(_usec / 1000000);
 
-    struct tm* t;
-#ifdef _WIN32
-    t = localtime(&time);
-#else
     struct tm tr;
+#ifdef _MSC_VER
+    localtime_s(&tr, &time);
+#else
     localtime_r(&time, &tr);
-    t = &tr;
 #endif
 
     char buf[32];
-    if(strftime(buf, sizeof(buf), format.c_str(), t) == 0)
+    if(strftime(buf, sizeof(buf), format.c_str(), &tr) == 0)
     {
         return std::string();
     }

data/ext/ice/cpp/src/IceUtil/UUID.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/UUID.h>
 
@@ -52,7 +47,7 @@ public:
         int p = GetCurrentProcessId();
 #endif
         myPid[0] = (p >> 8) & 0x7F;
-        myPid[1] = p & 0xFF;
+        myPid[1] = static_cast<char>(p & 0xFF);
     }
 };
 
@@ -70,11 +65,11 @@ inline void halfByteToHex(unsigned char hb, char*& hexBuffer)
 {
     if(hb < 10)
     {
-        *hexBuffer++ = '0' + hb;
+        *hexBuffer++ = '0' + static_cast<char>(hb);
     }
     else
     {
-        *hexBuffer++ = 'A' + (hb - 10);
+        *hexBuffer++ = 'A' + static_cast<char>(hb - 10);
     }
 }
 
@@ -98,7 +93,7 @@ IceUtil::generateUUID()
     RPC_STATUS ret = UuidCreate(&uuid);
     if(ret != RPC_S_OK && ret != RPC_S_UUID_LOCAL_ONLY && ret != RPC_S_UUID_NO_ADDRESS)
     {
-        throw new SyscallException(__FILE__, __LINE__, GetLastError());
+        throw SyscallException(__FILE__, __LINE__, GetLastError());
     }
 
     unsigned char* str;
@@ -106,7 +101,7 @@ IceUtil::generateUUID()
     ret = UuidToString(&uuid, &str);
     if(ret != RPC_S_OK)
     {
-        throw new SyscallException(__FILE__, __LINE__, GetLastError());
+        throw SyscallException(__FILE__, __LINE__, GetLastError());
     }
     string result = reinterpret_cast<char*>(str);
 
@@ -148,8 +143,8 @@ IceUtil::generateUUID()
     //
     // Replace the end of the node by myPid (15 bits)
     //
-    uuid.node[4] = (uuid.node[4] & 0x80) | myPid[0];
-    uuid.node[5] = myPid[1];
+    uuid.node[4] = (uuid.node[4] & 0x80) | static_cast<unsigned char>(myPid[0]);
+    uuid.node[5] = static_cast<unsigned char>(myPid[1]);
 
     //
     // Convert to a UUID string

data/ext/ice/cpp/src/IceUtil/Unicode.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #include <IceUtil/Config.h>
 

data/ext/ice/cpp/src/IceUtil/Unicode.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #ifndef ICE_UTIL_UNICODE_H
 #define ICE_UTIL_UNICODE_H

data/ext/ice/cpp/src/IceUtil/UtilException.cpp

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
 //
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
 
 #if defined(_MSC_VER) && _MSC_VER >= 1700
 //
@@ -48,7 +43,7 @@
 #       endif
 #   endif
 
-#   if !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS)
+#   if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS)
 #       include <execinfo.h>
 #       include <cxxabi.h>
 #       include <stdint.h>
@@ -56,7 +51,10 @@
 #   endif
 #endif
 
-#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__)
+//
+// The Slice compilers don't retrieve the exception stack traces so we don't need the DbgHelp calls.
+//
+#if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) && !defined(ICE_BUILDING_SLICE_COMPILERS)
 #   define ICE_DBGHELP
 #   if defined(_MSC_VER) && (_MSC_VER >= 1700)
 #       define DBGHELP_TRANSLATE_TCHAR
@@ -114,13 +112,13 @@ HANDLE process = 0;
 backtrace_state* bstate = 0;
 
 void
-ignoreErrorCallback(void*, const char* msg, int errnum)
+ignoreErrorCallback(void*, const char* /*msg*/, int /*errnum*/)
 {
     // cerr << "Error callback: " << msg << ", errnum = " << errnum << endl;
 }
 
 int
-ignoreFrame(void*, uintptr_t pc, const char*, int, const char*)
+ignoreFrame(void*, ICE_MAYBE_UNUSED uintptr_t pc, const char*, int, const char*)
 {
     assert(pc == 0);
     return 0;
@@ -301,7 +299,7 @@ printFrame(void* data, uintptr_t pc, const char* filename, int lineno, const cha
 #ifdef ICE_LIBBACKTRACE
 
 void
-handlePcInfoError(void* data, const char* msg, int errnum)
+handlePcInfoError(void* data, const char* /*msg*/, int /*errnum*/)
 {
     FrameInfo& frameInfo = *reinterpret_cast<FrameInfo*>(data);
     printFrame(&frameInfo, frameInfo.pc, 0, 0, 0);
@@ -352,8 +350,8 @@ getStackFrames()
 #elif defined(ICE_BACKTRACE)
 
     stackFrames.resize(100);
-    size_t stackDepth = backtrace(&stackFrames.front(), stackFrames.size());
-    stackFrames.resize(stackDepth);
+    int stackDepth = backtrace(&stackFrames.front(), static_cast<int>(stackFrames.size()));
+    stackFrames.resize(static_cast<size_t>(stackDepth));
     if(!stackFrames.empty())
     {
         stackFrames.erase(stackFrames.begin()); // drop the first frame
@@ -379,6 +377,7 @@ getStackTrace(const vector<void*>& stackFrames)
     // Note: the Sym functions are not thread-safe
     //
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
+    bool refreshModuleList = process != 0;
     if(process == 0)
     {
         process = GetCurrentProcess();
@@ -412,8 +411,10 @@ getStackTrace(const vector<void*>& stackFrames)
 
     lock.acquire();
 
-    // TODO: call SymRefreshModuleList here? (not available on XP)
-
+    if(refreshModuleList && SymRefreshModuleList(process) == 0)
+    {
+        return "No stack trace: SymRefreshModuleList failed with " + IceUtilInternal::errorToString(GetLastError());
+    }
 #ifdef DBGHELP_TRANSLATE_TCHAR
     const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
 #endif
@@ -467,7 +468,7 @@ getStackTrace(const vector<void*>& stackFrames)
     // Initialize backtraceStrings immediately
     if(p != stackFrames.end())
     {
-        backtraceStrings = backtrace_symbols(&*p, stackFrames.size());
+        backtraceStrings = backtrace_symbols(&*p, static_cast<int>(stackFrames.size()));
     }
 #   endif