diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-31 23:51:07 +0100 |
| commit | 224da4795283d1314bd255611730a2b46f84f68c (patch) | |
| tree | 9f118a2f9bafcce24ee3fd62057689bbd085d0d6 /src/server/shared/Utilities/Util.cpp | |
| parent | 9316b947863dcac7675fc9e4cf43a44c4e678ab9 (diff) | |
| parent | 19172ee4c26a12b844a7e1f435daed9bb44bf625 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/scripts/Spells/spell_dk.cpp
Diffstat (limited to 'src/server/shared/Utilities/Util.cpp')
| -rw-r--r-- | src/server/shared/Utilities/Util.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 2149956c19f..f2a6f1b7622 100644 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -510,6 +510,9 @@ void vutf8printf(FILE* out, const char *str, va_list* ap) wchar_t wtemp_buf[32*1024]; size_t temp_len = vsnprintf(temp_buf, 32*1024, str, *ap); + //vsnprintf returns -1 if the buffer is too small + if (temp_len == size_t(-1)) + temp_len = 32*1024-1; size_t wtemp_len = 32*1024-1; Utf8toWStr(temp_buf, temp_len, wtemp_buf, wtemp_len); |