45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 46700fbdbbbaab0d7db716fce3a438334c58ac9e Mon Sep 17 00:00:00 2001
|
|
From: "Sebastian Walz (sivizius)" <sebastian.walz@secunet.com>
|
|
Date: Mon, 19 Aug 2024 19:58:14 +0200
|
|
Subject: parser_json: release buffer returned by json_dumps
|
|
|
|
The signature of `json_dumps` is:
|
|
|
|
`char *json_dumps(const json_t *json, size_t flags)`:
|
|
|
|
It will return a pointer to an owned string, the caller must free it.
|
|
However, `json_error` just borrows the string to format it as `%s`, but
|
|
after printing the formatted error message, the pointer to the string is
|
|
lost and thus never freed.
|
|
|
|
Fixes: 586ad210368b ("libnftables: Implement JSON parser")
|
|
Signed-off-by: Sebastian Walz (sivizius) <sebastian.walz@secunet.com>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
|
Conflict:delete change about json_parse_cmd_add_set;change free_const to xfree
|
|
Reference:https://git.netfilter.org/nftables/commit/?id=46700fbdbbbaab0d7db716fce3a438334c58ac9e
|
|
|
|
---
|
|
src/parser_json.c | 11 ++++++++---
|
|
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/parser_json.c b/src/parser_json.c
|
|
index 4912d360..fc20fe29 100644
|
|
--- a/src/parser_json.c
|
|
+++ b/src/parser_json.c
|
|
@@ -181,8 +181,11 @@ static int json_unpack_stmt(struct json_ctx *ctx, json_t *root,
|
|
assert(value);
|
|
|
|
if (json_object_size(root) != 1) {
|
|
+ const char *dump = json_dumps(root, 0);
|
|
+
|
|
json_error(ctx, "Malformed object (too many properties): '%s'.",
|
|
- json_dumps(root, 0));
|
|
+ dump);
|
|
+ xfree(dump);
|
|
return 1;
|
|
}
|
|
|
|
--
|
|
cgit v1.2.3
|