From: Martin Josefsson <gandalf@wlug.westbo.se>
Date: Mon, 3 Jan 2005 07:46:07 +0000 (+0000)
Subject: Replace memchr with strlen and fix up one of the statements.
X-Git-Tag: v1.3.0-rc1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93911bff59ec6a7711091dddfbbb38d912ef517b;p=thirdparty%2Fiptables.git

Replace memchr with strlen and fix up one of the statements.
---

diff --git a/iptables.c b/iptables.c
index 3cedaccf..7144b393 100644
--- a/iptables.c
+++ b/iptables.c
@@ -1090,8 +1090,8 @@ register_match(struct iptables_match *me)
 		exit(1);
 	}
 
-	/* Revision field stole a char: check for 30 char names. */
-	if (!memchr(me->name, 0, IPT_FUNCTION_MAXNAMELEN-1)) {
+	/* Revision field stole a char from name. */
+	if (strlen(me->name) >= IPT_FUNCTION_MAXNAMELEN-1) {
 		fprintf(stderr, "%s: target `%s' has invalid name\n",
 			program_name, me->name);
 		exit(1);
@@ -1146,8 +1146,8 @@ register_target(struct iptables_target *me)
 		exit(1);
 	}
 
-	/* Revision field stole a char: check for 30 char names. */
-	if (!memchr(me->name, 0, IPT_FUNCTION_MAXNAMELEN)) {
+	/* Revision field stole a char from name. */
+	if (strlen(me->name) >= IPT_FUNCTION_MAXNAMELEN-1) {
 		fprintf(stderr, "%s: target `%s' has invalid name\n",
 			program_name, me->name);
 		exit(1);