com php-src: Adjust logic in sanity checks.: ext/filter/filter.c ext/filter/tests/057.phpt
| From: | Xinchen Hui | Date: | Sun, 08 Mar 2015 19:27:41 +0000 |
| Subject: | com php-src: Adjust logic in sanity checks.: ext/filter/filter.c ext/filter/tests/057.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85373@lists.php.net to get a copy of this message | ||
Commit: 1dc5bd47d8707ba805927681bc878087d6b9b5fa
Author: Jeff Welch <whatthejeff@gmail.com> Sun, 8 Mar 2015 11:31:26 -0400
Parents: 5aebdc98dea1f15993c21eefa25f83383b6e2389
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=1dc5bd47d8707ba805927681bc878087d6b9b5fa
Log:
Adjust logic in sanity checks.
The code should return false when the provided options argument is neither an
array nor a valid filter.
Changed paths:
M ext/filter/filter.c
A ext/filter/tests/057.phpt
Diff:
diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 107ba86..475cfcc 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -800,7 +800,7 @@ PHP_FUNCTION(filter_input_array)
return;
}
- if (op && (Z_TYPE_P(op) != IS_ARRAY) && (Z_TYPE_P(op) == IS_LONG &&
!PHP_FILTER_ID_EXISTS(Z_LVAL_P(op)))) {
+ if (op && (Z_TYPE_P(op) != IS_ARRAY) && !(Z_TYPE_P(op) == IS_LONG &&
PHP_FILTER_ID_EXISTS(Z_LVAL_P(op)))) {
RETURN_FALSE;
}
@@ -845,7 +845,7 @@ PHP_FUNCTION(filter_var_array)
return;
}
- if (op && (Z_TYPE_P(op) != IS_ARRAY) && (Z_TYPE_P(op) == IS_LONG &&
!PHP_FILTER_ID_EXISTS(Z_LVAL_P(op)))) {
+ if (op && (Z_TYPE_P(op) != IS_ARRAY) && !(Z_TYPE_P(op) == IS_LONG &&
PHP_FILTER_ID_EXISTS(Z_LVAL_P(op)))) {
RETURN_FALSE;
}
diff --git a/ext/filter/tests/057.phpt b/ext/filter/tests/057.phpt
new file mode 100644
index 0000000..93ab3ee
--- /dev/null
+++ b/ext/filter/tests/057.phpt
@@ -0,0 +1,23 @@
+--TEST--
+filter_input_array() and filter_var_array() with invalid $definition arguments
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+foreach (array(null, true, false, 1, "", new stdClass) as $invalid) {
+ var_dump(filter_input_array(INPUT_POST, $invalid));
+ var_dump(filter_var_array(array(), $invalid));
+}
+--EXPECT--
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)