- Fixed bug #54912 (filter/logical_filters.c:685:32: warning: use of logical || with...

  Initial patch by: crrodriguez at opensuse dot org

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index 59af952c12cac53a958185adba40f432166d10ff..8dc98fdd1ad54717573725233ed89e3d4c7c0672 100644 (file)
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -682,7 +682,7 @@ void php_filter_validate_ip(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
                RETURN_VALIDATION_FAILED
        }
 
-       if (flags & (FILTER_FLAG_IPV4 || FILTER_FLAG_IPV6)) {
+       if (flags & (FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)) {
                /* Both formats are cool */
        } else if ((flags & FILTER_FLAG_IPV4) && mode == FORMAT_IPV6) {
                RETURN_VALIDATION_FAILED