diff options
Diffstat (limited to 'src/share/utf8/utf8.c')
| -rw-r--r-- | src/share/utf8/utf8.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/share/utf8/utf8.c b/src/share/utf8/utf8.c index 0519d8e1..98a0b648 100644 --- a/src/share/utf8/utf8.c +++ b/src/share/utf8/utf8.c @@ -49,26 +49,22 @@ int utf8_encode(const char *from, char **to) len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, from, -1, NULL, 0); if(len == 0) break; - unicode = (wchar_t*) safe_malloc_mul_2op_((size_t)len, sizeof(wchar_t)); if(unicode == NULL) break; - len = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, from, -1, unicode, len); if(len == 0) break; len = WideCharToMultiByte(CP_UTF8, 0, unicode, -1, NULL, 0, NULL, NULL); if(len == 0) break; - utf8 = (char*) safe_malloc_mul_2op_((size_t)len, sizeof(char)); if(utf8 == NULL) break; - len = WideCharToMultiByte(CP_UTF8, 0, unicode, -1, utf8, len, NULL, NULL); if(len == 0) break; ret = 0; } while(0); - + free(unicode); if(ret == 0) { @@ -92,19 +88,15 @@ int utf8_decode(const char *from, char **to) len = MultiByteToWideChar(CP_UTF8, 0, from, -1, NULL, 0); if(len == 0) break; - unicode = (wchar_t*) safe_malloc_mul_2op_((size_t)len, sizeof(wchar_t)); if(unicode == NULL) break; - len = MultiByteToWideChar(CP_UTF8, 0, from, -1, unicode, len); if(len == 0) break; len = WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, unicode, -1, NULL, 0, NULL, NULL); if(len == 0) break; - acp = (char*) safe_malloc_mul_2op_((size_t)len, sizeof(char)); if(acp == NULL) break; - len = WideCharToMultiByte(CP_ACP, WC_COMPOSITECHECK, unicode, -1, acp, len, NULL, NULL); if(len == 0) break; |