shared/json: reject non-utf-8 strings
JSON strings must be utf-8-clean. We also verify this in json_parse_string()
so we would reject a message with invalid utf-8 anyway.
It would probably be slightly cheaper to detect non-conformaning strings in
serialization, but then we'd have to fail serialization. By doing this early,
we give the caller a chance to handle the error nicely.
The test is adjusted to contain a valid utf-8 string after decoding of the
utf-32 encoding in json ("विवेकख्यातिरविप्लवा हानोपायः।", something about the
cessation of ignorance).
This commit is contained in:
+8
-1
@@ -405,6 +405,9 @@ int json_variant_new_stringn(JsonVariant **ret, const char *s, size_t n) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!utf8_is_valid_n(s, n)) /* JSON strings must be valid UTF-8 */
|
||||
return -EUCLEAN;
|
||||
|
||||
r = json_variant_new(&v, JSON_VARIANT_STRING, n + 1);
|
||||
if (r < 0)
|
||||
return r;
|
||||
@@ -636,8 +639,12 @@ int json_variant_new_array_strv(JsonVariant **ret, char **l) {
|
||||
return r;
|
||||
|
||||
w->is_reference = true;
|
||||
} else
|
||||
} else {
|
||||
if (!utf8_is_valid_n(l[v->n_elements], k)) /* JSON strings must be valid UTF-8 */
|
||||
return -EUCLEAN;
|
||||
|
||||
memcpy(w->string, l[v->n_elements], k+1);
|
||||
}
|
||||
}
|
||||
|
||||
v->normalized = true;
|
||||
|
||||
Reference in New Issue
Block a user