Backport from xs.

This commit is contained in:
default 2023-05-15 10:31:15 +02:00
parent 08e43f2093
commit 59b049fe3b
2 changed files with 26 additions and 7 deletions

View File

@ -238,20 +238,39 @@ static xs_val *_xs_json_loads_lexer(const char **json, js_type *t)
case 't': c = '\t'; break;
case 'u': /* Unicode codepoint as an hex char */
s++;
memcpy(tmp, s, 4);
s += 3;
strncpy(tmp, s, 4);
tmp[4] = '\0';
if (strlen(tmp) != 4) {
*t = JS_ERROR;
break;
}
s += 3; /* skip as it was one byte */
sscanf(tmp, "%04x", &i);
if (i >= 0xd800 && i <= 0xdfff) {
/* it's a surrogate pair */
cp = (i & 0x3ff) << 10;
/* skip to the next value */
s += 3;
memcpy(tmp, s, 4);
s += 3;
/* skip to the next value (last char + \ + u) */
s++;
if (memcmp(s, "\\u", 2) != 0) {
*t = JS_ERROR;
break;
}
s += 2;
strncpy(tmp, s, 4);
tmp[4] = '\0';
if (strlen(tmp) != 4) {
*t = JS_ERROR;
break;
}
s += 3; /* skip as it was one byte */
sscanf(tmp, "%04x", &i);
cp |= (i & 0x3ff);

View File

@ -1 +1 @@
/* 333e84c76cd0e51f9f98a36df2eb3bf81e0d2608 */
/* 494e346f92431041350f72431417eee03a23eafd */