claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Virtual ISO: Fix buffer check during UTF-8 conversion

Browse Source
This commit is contained in:
RichardG867
2022-04-02 11:24:29 -03:00
parent 8f919d9367
commit 5053af633a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cdrom/cdrom_image_viso.c
View File

@@ -174,7 +174,7 @@ viso_convert_utf8(wchar_t *dest, const char *src, ssize_t buf_size)
c <<= 1; c <<= 1;
} }
c = *src++ & (0x3f >> next); c = *src++ & (0x3f >> next);
while ((next-- > 0) && (buf_size-- > 0)) while ((next-- > 0) && ((*src & 0xc0) == 0x80))
c = (c << 6) | (*src++ & 0x3f); c = (c << 6) | (*src++ & 0x3f);
} else { } else {
/* Pass through sub-UTF-8 codepoints. */ /* Pass through sub-UTF-8 codepoints. */
@@ -483,7 +483,7 @@ viso_fill_dir_record(uint8_t *data, viso_entry_t *entry, int type)
*q += 2; *q += 2;
} }
if (!((*q) & 1)) /* padding for even file ID lengths */ if (!(*q & 1)) /* padding for even file ID lengths */
*p++ = 0; *p++ = 0;
*p++ = 'R'; /* RR = present Rock Ridge entries (only documented by RRIP revision 1.09!) */ *p++ = 'R'; /* RR = present Rock Ridge entries (only documented by RRIP revision 1.09!) */
@@ -552,7 +552,7 @@ viso_fill_dir_record(uint8_t *data, viso_entry_t *entry, int type)
*p++ = 0; /* flags */ *p++ = 0; /* flags */
*r += viso_fill_fn_rr(p, entry, 254 - (p - data)); /* name */ *r += viso_fill_fn_rr(p, entry, 254 - (p - data)); /* name */
p += (*r) - 5; p += *r - 5;
pad_susp: pad_susp:
if ((p - data) & 1) /* padding for odd SUSP section lengths */ if ((p - data) & 1) /* padding for odd SUSP section lengths */
*p++ = 0; *p++ = 0;
@@ -564,7 +564,7 @@ pad_susp:
*q = viso_fill_fn_joliet(p, entry, 254 - (p - data)); *q = viso_fill_fn_joliet(p, entry, 254 - (p - data));
p += *q; p += *q;
if (!((*q) & 1)) /* padding for even file ID lengths */ if (!(*q & 1)) /* padding for even file ID lengths */
*p++ = 0; *p++ = 0;
break; break;
} }