json: strip spaces and special chars when copying objects

When turning an object into a string, strip out all special chars
and duplicate spaces.
This commit is contained in:
Wim Taymans 2021-02-06 20:20:26 +01:00
parent f1e56b2317
commit 0be2959f11

View file

@ -287,31 +287,45 @@ static inline int spa_json_parse_string(const char *val, int len, char *result)
{ {
const char *p; const char *p;
if (!spa_json_is_string(val, len)) { if (!spa_json_is_string(val, len)) {
strncpy(result, val, len); bool skip = false;
result[len] = '\0'; for (p = val; p < val + len; p++) {
return 1; switch (*p) {
} case '\n': case '\r': case '\b': case '\t': case '\f':
for (p = val+1; p < val + len; p++) { break;
if (*p == '\\') { case ' ':
p++; if (!skip)
if (*p == 'n') *result++ = *p;
*result++ = '\n'; skip = true;
else if (*p == 'r') break;
*result++ = '\r'; default:
else if (*p == 'b')
*result++ = '\b';
else if (*p == 't')
*result++ = '\t';
else if (*p == 'f')
*result++ = '\f';
else
*result++ = *p; *result++ = *p;
} else if (*p == '\"') { skip = false;
break; break;
} else }
*result++ = *p; }
} else {
for (p = val+1; p < val + len; p++) {
if (*p == '\\') {
p++;
if (*p == 'n')
*result++ = '\n';
else if (*p == 'r')
*result++ = '\r';
else if (*p == 'b')
*result++ = '\b';
else if (*p == 't')
*result++ = '\t';
else if (*p == 'f')
*result++ = '\f';
else
*result++ = *p;
} else if (*p == '\"') {
break;
} else
*result++ = *p;
}
} }
*result++ = '\0'; *result = '\0';
return 1; return 1;
} }