mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

encoding_utf: Fix coverity warnings, extra error checking

Browse Source
This commit is contained in:
bparker06 2017-10-19 17:24:35 -04:00 committed by GitHub
parent e9708be756
commit b0f8a570b5
1 changed files with 71 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
libretro-common/encodings/encoding_utf.c
View File

@ -352,8 +352,14 @@ char* local_to_utf8_string_alloc(const char *str)
/* Returned pointer MUST be freed by the caller if non-NULL. */ /* Returned pointer MUST be freed by the caller if non-NULL. */
wchar_t* utf8_to_utf16_string_alloc(const char *str) wchar_t* utf8_to_utf16_string_alloc(const char *str)
{ {
size_t len, out_len; #ifdef _WIN32
wchar_t *buf; int len = 0;
int out_len = 0;
#else
size_t len = 0;
size_t out_len = 0;
#endif
wchar_t *buf = NULL;
if (!str || !*str) if (!str || !*str)
return NULL; return NULL;
@ -361,23 +367,41 @@ wchar_t* utf8_to_utf16_string_alloc(const char *str)
#ifdef _WIN32 #ifdef _WIN32
len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0); len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0);
buf = (wchar_t*)calloc(len, sizeof(wchar_t)); if (len)
{
buf = (wchar_t*)calloc(len, sizeof(wchar_t));
if (!buf)
return NULL;
out_len = MultiByteToWideChar(CP_UTF8, 0, str, -1, buf, len); out_len = MultiByteToWideChar(CP_UTF8, 0, str, -1, buf, len);
#else }
/* NOTE: For now, assume non-Windows platforms' locale is already UTF-8. */
len = mbstowcs(NULL, str, 0) + 1;
buf = (wchar_t*)calloc(len, sizeof(wchar_t));
out_len = mbstowcs(buf, str, len);
#endif
if (out_len < 0) if (out_len < 0)
{ {
free(buf); free(buf);
return NULL; return NULL;
} }
#else
/* NOTE: For now, assume non-Windows platforms' locale is already UTF-8. */
len = mbstowcs(NULL, str, 0) + 1;
if (len)
{
buf = (wchar_t*)calloc(len, sizeof(wchar_t));
if (!buf)
return NULL;
out_len = mbstowcs(buf, str, len);
}
if (out_len == (size_t)-1)
{
free(buf);
return NULL;
}
#endif
return buf; return buf;
} }
@ -385,8 +409,14 @@ wchar_t* utf8_to_utf16_string_alloc(const char *str)
/* Returned pointer MUST be freed by the caller if non-NULL. */ /* Returned pointer MUST be freed by the caller if non-NULL. */
char* utf16_to_utf8_string_alloc(const wchar_t *str) char* utf16_to_utf8_string_alloc(const wchar_t *str)
{ {
size_t len, out_len; #ifdef _WIN32
char *buf; int len = 0;
int out_len = 0;
#else
size_t len = 0;
size_t out_len = 0;
#endif
char *buf = NULL;
if (!str || !*str) if (!str || !*str)
return NULL; return NULL;
@ -394,23 +424,41 @@ char* utf16_to_utf8_string_alloc(const wchar_t *str)
#ifdef _WIN32 #ifdef _WIN32
len = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL); len = WideCharToMultiByte(CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL);
buf = (char*)calloc(len, sizeof(char)); if (len)
{
buf = (char*)calloc(len, sizeof(char));
out_len = WideCharToMultiByte(CP_UTF8, 0, str, -1, buf, len, NULL, NULL); if (!buf)
#else return NULL;
/* NOTE: For now, assume non-Windows platforms' locale is already UTF-8. */
len = wcstombs(NULL, str, 0) + 1;
buf = (char*)calloc(len, sizeof(char)); out_len = WideCharToMultiByte(CP_UTF8, 0, str, -1, buf, len, NULL, NULL);
}
out_len = wcstombs(buf, str, len);
#endif
if (out_len < 0) if (out_len < 0)
{ {
free(buf); free(buf);
return NULL; return NULL;
} }
#else
/* NOTE: For now, assume non-Windows platforms' locale is already UTF-8. */
len = wcstombs(NULL, str, 0) + 1;
if (len)
{
buf = (char*)calloc(len, sizeof(char));
if (!buf)
return NULL;
out_len = wcstombs(buf, str, len);
}
if (out_len == (size_t)-1)
{
free(buf);
return NULL;
}
#endif
return buf; return buf;
} }