summaryrefslogtreecommitdiffstats
path: root/src/parser_json.c
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2019-09-13 17:20:04 +0200
committerPhil Sutter <phil@nwl.cc>2019-09-14 01:05:03 +0200
commit5731cc15d3929312c5b63206c8a8a06fb8ce6bab (patch)
tree71798e3c49b8b0962a9da1d0fdd2088f7795962d /src/parser_json.c
parente1e33b8907bf7c2110bdc3990908a0049bbbe71d (diff)
parser_bison: Fix 'exists' keyword on Big Endian
Size value passed to constant_expr_alloc() must correspond with actual data size, otherwise wrong portion of data will be taken later when serializing into netlink message. Booleans require really just a bit, but make type of boolean_keys be uint8_t (introducing new 'val8' name for it) and pass the data length using sizeof() to avoid any magic numbers. While being at it, fix len value in parser_json.c as well although it worked before due to the value being rounded up to the next multiple of 8. Fixes: 9fd9baba43c8e ("Introduce boolean datatype and boolean expression") Signed-off-by: Phil Sutter <phil@nwl.cc> Acked-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/parser_json.c')
-rw-r--r--src/parser_json.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/parser_json.c b/src/parser_json.c
index 398ae192..5dd410af 100644
--- a/src/parser_json.c
+++ b/src/parser_json.c
@@ -351,7 +351,8 @@ static struct expr *json_parse_immediate(struct json_ctx *ctx, json_t *root)
case JSON_FALSE:
buf[0] = json_is_true(root);
return constant_expr_alloc(int_loc, &boolean_type,
- BYTEORDER_HOST_ENDIAN, 1, buf);
+ BYTEORDER_HOST_ENDIAN,
+ BITS_PER_BYTE, buf);
default:
json_error(ctx, "Unexpected JSON type %s for immediate value.",
json_typename(root));