mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

prevent read beyond end of buffer when string ends with malformed utf

Browse Source
This commit is contained in:
Mike Jerris 2017-02-23 08:59:25 -06:00
parent 4fce9cce86
commit 72e6e23523
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cJSON.c
View File

@ -422,8 +422,6 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
unsigned char utf8_length = 0; unsigned char utf8_length = 0;
unsigned char sequence_length = 0; unsigned char sequence_length = 0;
/* get the first utf16 sequence */
first_code = parse_hex4(first_sequence + 2);
if ((input_end - first_sequence) < 6) if ((input_end - first_sequence) < 6)
{ {
/* input ends unexpectedly */ /* input ends unexpectedly */
@ -431,6 +429,9 @@ static unsigned char utf16_literal_to_utf8(const unsigned char * const input_poi
goto fail; goto fail;
} }
/* get the first utf16 sequence */
first_code = parse_hex4(first_sequence + 2);
/* check that the code is valid */ /* check that the code is valid */
if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)) || (first_code == 0)) if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)) || (first_code == 0))
{ {