From: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Date: Wed, 25 Sep 2013 20:06:34 +0000 (+0200)
Subject: rule: json: fix returned string length
X-Git-Tag: libnftnl-1.0.0~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7c068d;p=thirdparty%2Flibnftnl.git

rule: json: fix returned string length

It was returning one byte more than the real string length.

Signed-off-by: Alvaro Neira Ayuso <alvaroneay@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/rule.c b/src/rule.c
index b4ce8f1c..5fd8814f 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -745,7 +745,9 @@ static int nft_rule_snprintf_json(char *buf, size_t size, struct nft_rule *r,
 		SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
 	}
-	ret = snprintf(buf+offset-1, len, "]}}");
+	/* Remove comma from last element */
+	offset--;
+	ret = snprintf(buf+offset, len, "]}}");
 	SNPRINTF_BUFFER_SIZE(ret, size, len, offset);
 
 	return offset;