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

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 988337aa29459c68034ca4e833524424f9530632..43756b144973ad9f1b7137e2f0794f00ea52da51 100644 (file)
--- 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
                                }