80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Virtual ISO: Fix Joliet UTF-16 break check

Browse Source
This commit is contained in:
RichardG867
2022-04-01 16:44:52 -03:00
parent 850f7101d1
commit c745a6b71a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cdrom/cdrom_image_viso.c
View File

@@ -375,10 +375,12 @@ viso_fill_fn_joliet(uint8_t *data, const viso_entry_t *entry, size_t max_len) /*
if (!S_ISDIR(entry->stats.st_mode)) { if (!S_ISDIR(entry->stats.st_mode)) {
wchar_t *ext = wcsrchr(utf8dec, L'.'); wchar_t *ext = wcsrchr(utf8dec, L'.');
if (ext > utf8dec) { if (ext > utf8dec) {
len = wcslen(ext); len = 0;
for (size_t i = 0; ext[i]; i++)
len += 1 + ((ext[i] >= 0x10000) && (ext[i] <= 0x10ffff));
if (len > max_len) if (len > max_len)
len = max_len; len = max_len;
else if ((len < max_len) && ((be16_to_cpu(data[max_len - len]) & 0xfc00) == 0xdc00)) /* don't break an UTF-16 pair */ else if ((len < max_len) && ((be16_to_cpu(((uint16_t *) data)[max_len - len]) & 0xfc00) == 0xdc00)) /* don't break an UTF-16 pair */
max_len--; max_len--;
viso_write_wstring(((uint16_t *) data) + (max_len - len), ext, len, VISO_CHARSET_FN); viso_write_wstring(((uint16_t *) data) + (max_len - len), ext, len, VISO_CHARSET_FN);
} }