mirror/stedolan-jq
1
0
Fork 0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00
Code Issues Releases Activity

Fix a parsing bug for \uXXXX escapes (some invalid escapes were accepted).

Browse Source 
Found by gcc -O -Wall identifying a use of uninitialised variables.
This commit is contained in:
Stephen Dolan
2012-09-18 23:45:30 +01:00
parent 3898f744dc
commit 134b062be7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jv_parse.c
View File

@ -155,6 +155,7 @@ static int unhex4(char* hex) {
if ('0' <= c && c <= '9') n = c - '0';
else if ('a' <= c && c <= 'f') n = c - 'a' + 10;
else if ('A' <= c && c <= 'F') n = c - 'A' + 10;
else return -1;
r <<= 4;
r |= n;
}
@ -186,7 +187,10 @@ static pfunc found_string(struct jv_parser* p) {
/* ahh, the complicated case */
if (in + 4 > end)
return "Invalid \\uXXXX escape";
unsigned long codepoint = unhex4(in);
int hexvalue = unhex4(in);
if (hexvalue < 0)
return "Invalid characters in \\uXXXX escape";
unsigned long codepoint = (unsigned long)hexvalue;
in += 4;
if (0xD800 <= codepoint && codepoint <= 0xDBFF) {
/* who thought UTF-16 surrogate pairs were a good idea? */