mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-kwsys' into update-kwsys

Browse Source
This commit is contained in:
Brad King
2015-08-03 13:17:54 -04:00
parent 7ac2b1256b 9a59ae5c19
commit 3da431379b
3 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/kwsys/EncodingC.c
+10 -4
View File
@@ -45,8 +45,11 @@ wchar_t* kwsysEncoding_DupToWide(const char* str)
if(length > 0)
{
ret = (wchar_t*)malloc((length)*sizeof(wchar_t));
ret[0] = 0;
kwsysEncoding_mbstowcs(ret, str, length);
if(ret)
{
ret[0] = 0;
kwsysEncoding_mbstowcs(ret, str, length);
}
}
return ret;
}
@@ -72,8 +75,11 @@ char* kwsysEncoding_DupToNarrow(const wchar_t* str)
if(length > 0)
{
ret = (char*)malloc(length);
ret[0] = 0;
kwsysEncoding_wcstombs(ret, str, length);
if(ret)
{
ret[0] = 0;
kwsysEncoding_wcstombs(ret, str, length);
}
}
return ret;
}