sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

libutil/iconv: avoid overflow in surrogate pairs

Browse Source 
Consider the non-conforment utf-8 sequence "\xf5\x80\x80\x80", which
would encode 0x140000. We would set the high byte of the first
surrogate to 0xd8 | (0x130000 >> 18), or 0xdc, which is an invalid
start for a high surrogate, making the sequence as a whole invalid (as
you would expect -- the Unicode range was set precisely to that
covered by utf-16 surrogates).

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2023-07-05 14:32:05 +12:00 committed by Andrew Bartlett
parent 949fe57077
commit 3960eabca7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/util/charset/iconv.c
View File

@ -923,6 +923,16 @@ static size_t utf8_pull(void *cd, const char **inbuf, size_t *inbytesleft,
errno = EILSEQ;
goto error;
}
if (codepoint > 0x10ffff) {
/*
* Unicode stops at 0x10ffff, and if
* we ignore that, we'll end up
* encoding the wrong characters in
* the surrogate pair.
*/
errno = EILSEQ;
goto error;
}
codepoint -= 0x10000;