From: Max Kellerman <max@duempel.org>
Date: Thu, 17 Feb 2011 10:57:19 +0000 (+0100)
Subject: xtables: use strspn() to check if string needs to be quoted
X-Git-Tag: v1.4.11~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87dc7c4c842deb1e2e3d38089ffcad9f238d98de;p=thirdparty%2Fiptables.git

xtables: use strspn() to check if string needs to be quoted

Problem: the call xtables_save_string("'") prints just a single quote,
not enclosed in double quoted and not escaped.

Steps to reproduce:

 $ iptables -A foo -m comment --comment "'" -j ACCEPT
 $ iptables-multi save|grep foo
 -A foo -m comment --comment ' -j ACCEPT

The cause was the use of strcspn() to locate the first character which
justified quoting the string in double quotes.  That however was
wrong, because the way strcspn() was called, it returned a pointer to
the first character that was not to be escaped, which did the right
thing most of the time, but not for strings consisting only of quote
characters.  This patch changes strcspn() to strspn().

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

diff --git a/xtables.c b/xtables.c
index fc59f753..57d5d13e 100644
--- a/xtables.c
+++ b/xtables.c
@@ -1638,7 +1638,7 @@ void xtables_save_string(const char *value)
 	size_t length;
 	const char *p;
 
-	length = strcspn(value, no_quote_chars);
+	length = strspn(value, no_quote_chars);
 	if (length > 0 && value[length] == 0) {
 		/* no quoting required */
 		putchar(' ');