[netfilter-cvslog] r3558 - trunk/iptables

[gandalf at netfilter.org]

Author: gandalf at netfilter.org
Date: 2005-01-03 08:46:07 +0100 (Mon, 03 Jan 2005)
New Revision: 3558

Modified:
   trunk/iptables/iptables.c
Log:
Replace memchr with strlen and fix up one of the statements.


Modified: trunk/iptables/iptables.c
===================================================================
--- trunk/iptables/iptables.c	2005-01-03 03:48:40 UTC (rev 3557)
+++ trunk/iptables/iptables.c	2005-01-03 07:46:07 UTC (rev 3558)
@@ -1090,8 +1090,8 @@
 		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 @@
 		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);