- #40947, allow a single filter as argument for filter_var_array

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 45cf86004c131c79276b77ee4b5717036c186dfc..dff2ea65b02bad55162a5ed5fe370b4673d67795 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -776,8 +776,10 @@ PHP_FUNCTION(filter_input_array)
                return;
        }
 
-       if (op && ( (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
-               || Z_TYPE_PP(op) != IS_ARRAY)) {
+       if (op
+               && (Z_TYPE_PP(op) != IS_ARRAY)
+               && (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
+               ) {
                RETURN_FALSE;
        }
 
@@ -815,8 +817,10 @@ PHP_FUNCTION(filter_var_array)
                return;
        }
 
-       if (op && ( (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
-               || Z_TYPE_PP(op) != IS_ARRAY)) {
+       if (op
+               && (Z_TYPE_PP(op) != IS_ARRAY)
+               && (Z_TYPE_PP(op) == IS_LONG && !PHP_FILTER_ID_EXISTS(Z_LVAL_PP(op)))
+               ) {
                RETURN_FALSE;
        }