diff options
| author | Álvaro Neira Ayuso <alvaroneay@gmail.com> | 2013-08-14 12:19:19 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-08-17 12:49:54 +0200 |
| commit | 0334a23918ebb008f81694e855141b8d8f5f72a9 (patch) | |
| tree | a49a29e51fe88de8eb3253b4539f9082f7da4f89 /src/chain.c | |
| parent | 7c24c00fe03318a4b95a0b9cf02257604c954937 (diff) | |
json: fixed some leaks in the json parsing function
This patch fixes some leaks in the json parsing function. After this patch,
we use nft_jansson_free_root. This function uses json_decref and it
decrements the reference count and it releases the node if needed.
Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/chain.c')
| -rw-r--r-- | src/chain.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/chain.c b/src/chain.c index da0299f..ac6e7ad 100644 --- a/src/chain.c +++ b/src/chain.c @@ -482,14 +482,18 @@ static inline int nft_str2hooknum(const char *hook) static int nft_chain_json_parse(struct nft_chain *c, char *json) { #ifdef JSON_PARSING - json_t *root; + json_t *root, *node; json_error_t error; uint64_t uval64; uint32_t policy; int32_t val32; const char *valstr; - root = nft_jansson_get_root(json, "chain", &error); + node = nft_jansson_create_root(json, &error); + if (node == NULL) + return -1; + + root = nft_jansson_get_node(node, "chain"); if (root == NULL) return -1; @@ -497,7 +501,7 @@ static int nft_chain_json_parse(struct nft_chain *c, char *json) if (valstr == NULL) goto err; - nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_NAME, strdup(valstr)); + nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_NAME, valstr); if (nft_jansson_value_parse_val(root, "handle", NFT_TYPE_U64, &uval64) == -1) @@ -518,7 +522,7 @@ static int nft_chain_json_parse(struct nft_chain *c, char *json) nft_chain_attr_set_u64(c, NFT_CHAIN_ATTR_PACKETS, uval64); if (nft_jansson_parse_family(root, &val32) != 0) - return -1; + goto err; nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_FAMILY, val32); @@ -527,7 +531,7 @@ static int nft_chain_json_parse(struct nft_chain *c, char *json) if (valstr == NULL) goto err; - nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TABLE, strdup(valstr)); + nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TABLE, valstr); if (nft_jansson_node_exist(root, "hooknum")) { valstr = nft_jansson_value_parse_str(root, "type"); @@ -535,7 +539,7 @@ static int nft_chain_json_parse(struct nft_chain *c, char *json) if (valstr == NULL) goto err; - nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TYPE, strdup(valstr)); + nft_chain_attr_set_str(c, NFT_CHAIN_ATTR_TYPE, valstr); if (nft_jansson_value_parse_val(root, "prio", NFT_TYPE_S32, &val32) == -1) @@ -564,11 +568,11 @@ static int nft_chain_json_parse(struct nft_chain *c, char *json) nft_chain_attr_set_u32(c, NFT_CHAIN_ATTR_POLICY, policy); } - xfree(root); + nft_jansson_free_root(node); return 0; err: - xfree(root); + nft_jansson_free_root(node); return -1; #else errno = EOPNOTSUPP; |