diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-09-22 15:44:10 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-09-22 15:44:10 +0000 |
| commit | f683ef370bcb987a9f96fc5da0793d71e3721d29 (patch) | |
| tree | d0ef420f3cab12b8bab3563dbd71618adba704a3 /cpp/src/Ice/Network.cpp | |
| parent | minor (diff) | |
| download | ice-f683ef370bcb987a9f96fc5da0793d71e3721d29.tar.bz2 ice-f683ef370bcb987a9f96fc5da0793d71e3721d29.tar.xz ice-f683ef370bcb987a9f96fc5da0793d71e3721d29.zip | |
thread fixes
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index a93d113dcd6..aaf88639909 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -730,17 +730,24 @@ IceInternal::errorToString(int error) { if(error < WSABASEERR) { - LPVOID lpMsgBuf; - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - error, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language - (LPTSTR)&lpMsgBuf, - 0, - NULL); - string result = (LPCTSTR)lpMsgBuf; - LocalFree( lpMsgBuf ); - return result; + LPVOID lpMsgBuf = 0; + DWORD ok = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + error, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language + (LPTSTR)&lpMsgBuf, + 0, + NULL); + if(ok) + { + LPCTSTR msg = (LPCTSTR)lpMsgBuf; + assert(msg && strlen(msg) > 0); + string result = msg; + LocalFree(lpMsgBuf); + return result; + } } switch(error) |