aboutsummaryrefslogtreecommitdiff
path: root/src/shared/Util.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-18 16:51:10 -0600
committermegamage <none@none>2009-02-18 16:51:10 -0600
commit8c7daebae902fc3b8fcd16113a89ea8d90d913f9 (patch)
tree387b3a09fc08a73b1b4315b563709184f5c823c2 /src/shared/Util.cpp
parentd0a3d03422ccf25b1b8c9ac4778189ed484ee930 (diff)
[7296] Fixed some GCC warnings. Author: VladimirMangos
--HG-- branch : trunk
Diffstat (limited to 'src/shared/Util.cpp')
-rw-r--r--src/shared/Util.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/shared/Util.cpp b/src/shared/Util.cpp
index 36c41e5da48..767b65e441c 100644
--- a/src/shared/Util.cpp
+++ b/src/shared/Util.cpp
@@ -254,8 +254,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
size_t len = utf8::distance(utf8str,utf8str+csize);
if(len > wsize)
{
+ if(wsize > 0)
+ wstr[0] = L'\0';
wsize = 0;
- wstr = L"";
return false;
}
@@ -265,8 +266,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize)
}
catch(std::exception)
{
+ if(wsize > 0)
+ wstr[0] = L'\0';
wsize = 0;
- wstr = L"";
return false;
}