shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

json: let's not accept embedded NUL bytes when allocating JSON strings

Browse Source 
Let's add an additional paranoia check, and not accept embedded NUL
bytes in strings, just in case.
This commit is contained in:
Lennart Poettering 2019-01-08 18:34:38 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent b2bdf6e456
commit cbb3092ce6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/json.c
View File

@ -379,9 +379,13 @@ int json_variant_new_stringn(JsonVariant **ret, const char *s, size_t n) {
assert_return(ret, -EINVAL);
if (!s) {
assert_return(n == 0, -EINVAL);
assert_return(IN_SET(n, 0, (size_t) -1), -EINVAL);
return json_variant_new_null(ret);
}
if (n == (size_t) -1) /* determine length automatically */
n = strlen(s);
else if (memchr(s, 0, n)) /* don't allow embedded NUL, as we can't express that in JSON */
return -EINVAL;
if (n == 0) {
*ret = JSON_VARIANT_MAGIC_EMPTY_STRING;
return 0;
@ -585,7 +589,7 @@ int json_variant_new_array_strv(JsonVariant **ret, char **l) {
if (k > INLINE_STRING_MAX) {
/* If string is too long, store it as reference. */
r = json_variant_new_stringn(&w->reference, l[v->n_elements], k);
r = json_variant_new_string(&w->reference, l[v->n_elements]);
if (r < 0)
return r;

2
src/shared/json.h
View File

@ -65,7 +65,7 @@ int json_variant_new_object(JsonVariant **ret, JsonVariant **array, size_t n);
int json_variant_new_null(JsonVariant **ret);
static inline int json_variant_new_string(JsonVariant **ret, const char *s) {
return json_variant_new_stringn(ret, s, strlen_ptr(s));
return json_variant_new_stringn(ret, s, (size_t) -1);
}
JsonVariant *json_variant_ref(JsonVariant *v);