mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

json: convert utf16 to utf8

Browse source 
We work with utf8 string so convert the unicode escape sequences to
utf8.

Fixes #2337
This commit is contained in:
Wim Taymans 2022-04-26 15:38:22 +02:00
parent f2cdb15e0c
commit 5137015c33
2 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

29
spa/include/spa/utils/json.h
View file

@ -355,16 +355,33 @@ static inline int spa_json_parse_stringn(const char *val, int len, char *result,
else if (*p == 'f')
*result++ = '\f';
else if (*p == 'u') {
uint8_t v[2];
uint8_t v[2], prefix[] = { 0, 0xc0, 0xe0, 0xf0 };
uint32_t idx, n, cp, enc[] = { 0x80, 0x800, 0x10000 };
if (p + 5 > val + len ||
sscanf(p+1, "%02hhx%02hhx", &v[0], &v[1]) != 2) {
*result++ = *p;
} else {
p += 4;
if (v[0] != 0)
*result++ = v[0];
*result++ = v[1];
continue;
}
cp = v[0] << 8 | v[1];
p += 4;
if (cp >= 0xd800 && cp <= 0xdbff) {
if (p + 7 > val + len ||
sscanf(p+1, "\\u%02hhx%02hhx", &v[0], &v[1]) != 2 ||
v[0] <= 0xdb || v[0] >= 0xe0)
continue;
p += 6;
cp = 0x010000 | ((cp & 0x3ff) << 10) | (((v[0] << 8 | v[1])) & 0x3ff);
} else if (cp >= 0xdc00 && cp <= 0xdfff)
continue;
for (idx = 0; idx < 3; idx++)
if (cp < enc[idx])
break;
for (n = idx; n > 0; n--, cp >>= 6)
result[n] = (cp | 0x80) & 0xbf;
*result++ = (cp | prefix[idx]) & 0xff;
result += idx;
} else
*result++ = *p;
} else if (*p == '\"') {

2
test/test-spa-json.c
View file

@ -178,7 +178,7 @@ PWTEST(json_encode)
pwtest_str_eq(result, "\x04\x05\x1f\x20\x01\x7f\x90");
strcpy(dst, "\"\\u03b2a\"");
pwtest_int_eq(spa_json_parse_stringn(dst, sizeof(dst), result, sizeof(result)), 1);
pwtest_str_eq(result, "\003\262a");
pwtest_str_eq(result, "\316\262a");
return PWTEST_PASS;
}