DarkStore-3DS/Project_CTR
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/Project_CTR.git synced 2026-07-02 16:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from muhmuhten/master

Browse Source 
Fix UTF-16 to UTF-8 conversion on non-Windows
This commit is contained in:
Jack
2020-04-08 15:17:13 +08:00
committed by GitHub
parent 2992453295 8cbeb744d7
commit fa56d1ab15
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ctrtool/oschar.c
+4 -3
View File
@@ -152,10 +152,11 @@ char* strcopy_UTF16toUTF8(const utf16char_t *src)
return NULL;
src_len = utf16_strlen(src);
dst_len = src_len * 2;
// UTF-8 can use up to 3 bytes per UTF-16 code unit, or four for a surrogate pair
dst_len = src_len * 3;
// Allocate memory for string
dst = calloc(dst_len, sizeof(char)); // twice the size, as UTF-8 will use up to two bytes for converted UTF16 chars afaik
dst = calloc(dst_len, sizeof(char));
if (!dst)
return NULL;
@@ -206,4 +207,4 @@ oschar_t* os_AppendUTF16StrToPath(const oschar_t *src, const utf16char_t *add)
free(_add);
return new_path;
}
}
makerom/oschar.c
+4 -3
View File
@@ -152,10 +152,11 @@ char* strcopy_UTF16toUTF8(const utf16char_t *src)
return NULL;
src_len = utf16_strlen(src);
dst_len = src_len * 2;
// UTF-8 can use up to 3 bytes per UTF-16 code unit, or four for a surrogate pair
dst_len = src_len * 3;
// Allocate memory for string
dst = calloc(dst_len, sizeof(char)); // twice the size, as UTF-8 will use up to two bytes for converted UTF16 chars afaik
dst = calloc(dst_len, sizeof(char));
if (!dst)
return NULL;
@@ -206,4 +207,4 @@ oschar_t* os_AppendUTF16StrToPath(const oschar_t *src, const utf16char_t *add)
free(_add);
return new_path;
}
}