From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 31 Dec 2006 22:47:27 +0000 (+0000)
Subject: MFB: Simplify code and change strchr() to memchr()
X-Git-Tag: RELEASE_1_0_0RC1~443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e654e4d53b37dc96d0c6dd86b5bb49ec06d2981;p=php

MFB: Simplify code and change strchr() to memchr()
---

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 988337aa29..43756b1449 100644
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -597,15 +597,12 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 	 * allow_ipv4 and allow_ipv6 flags flag are used, then the first dot or
 	 * colon determine the format */
 
-	char          *str = NULL;
 	int            ip[4];
 	int            mode;
 
-	str = Z_STRVAL_P(value);
-
-	if (strchr(str, ':')) {
+	if (memchr(Z_STRVAL_P(value), ':', Z_STRLEN_P(value))) {
 		mode = FORMAT_IPV6;
-	} else if (strchr(str, '.')) {
+	} else if (memchr(Z_STRVAL_P(value), '.', Z_STRLEN_P(value))) {
 		mode = FORMAT_IPV4;
 	} else {
 		RETURN_VALIDATION_FAILED
@@ -621,7 +618,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 
 	switch (mode) {
 		case FORMAT_IPV4:
-			if (!_php_filter_validate_ipv4(str, Z_STRLEN_P(value), ip)) {
+			if (!_php_filter_validate_ipv4(Z_STRVAL_P(value), Z_STRLEN_P(value), ip)) {
 				RETURN_VALIDATION_FAILED
 			}
 
@@ -651,7 +648,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
 		case FORMAT_IPV6:
 			{
 				int res = 0;
-				res = _php_filter_validate_ipv6(str, Z_STRLEN_P(value) TSRMLS_CC);
+				res = _php_filter_validate_ipv6(Z_STRVAL_P(value), Z_STRLEN_P(value) TSRMLS_CC);
 				if (res < 1) {
 					RETURN_VALIDATION_FAILED
 				}