tony2001 Mon Nov 13 19:32:58 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/filter filter.c
/php-src/ext/filter/tests 039.phpt
Log:
MFH: improve the fix and the test
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/filter.c?r1=1.52.2.27&r2=1.52.2.28&diff_format=u
Index: php-src/ext/filter/filter.c
diff -u php-src/ext/filter/filter.c:1.52.2.27
php-src/ext/filter/filter.c:1.52.2.28
--- php-src/ext/filter/filter.c:1.52.2.27 Mon Nov 13 15:00:05 2006
+++ php-src/ext/filter/filter.c Mon Nov 13 19:32:58 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: filter.c,v 1.52.2.27 2006/11/13 15:00:05 tony2001 Exp $ */
+/* $Id: filter.c,v 1.52.2.28 2006/11/13 19:32:58 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -275,7 +275,7 @@
{
php_info_print_table_start();
php_info_print_table_header( 2, "Input Validation and Filtering",
"enabled" );
- php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.27 $");
+ php_info_print_table_row( 2, "Revision", "$Revision: 1.52.2.28 $");
php_info_print_table_end();
DISPLAY_INI_ENTRIES();
@@ -607,14 +607,16 @@
zval **tmp, **arg_elm;
if (!op) {
- SEPARATE_ZVAL(&input);
+ zval_dtor(return_value);
*return_value = *input;
zval_copy_ctor(return_value);
+ INIT_PZVAL(return_value);
php_filter_call(&return_value, FILTER_DEFAULT, NULL, 0,
FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_LONG) {
- SEPARATE_ZVAL(&input);
+ zval_dtor(return_value);
*return_value = *input;
zval_copy_ctor(return_value);
+ INIT_PZVAL(return_value);
php_filter_call(&return_value, Z_LVAL_PP(op), NULL, 0,
FILTER_REQUIRE_ARRAY TSRMLS_CC);
} else if (Z_TYPE_PP(op) == IS_ARRAY) {
array_init(return_value);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/039.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/filter/tests/039.phpt
diff -u php-src/ext/filter/tests/039.phpt:1.1.2.2
php-src/ext/filter/tests/039.phpt:1.1.2.3
--- php-src/ext/filter/tests/039.phpt:1.1.2.2 Mon Nov 13 14:51:11 2006
+++ php-src/ext/filter/tests/039.phpt Mon Nov 13 19:32:58 2006
@@ -28,6 +28,19 @@
var_dump(filter_var_array(array("var_name"=>""), array("var_name"=>-1,
"asdas"=>"asdasd", "qwe"=>"rty", ""=>"")));
var_dump(filter_var_array(array("asdas"=>"text"), array("var_name"=>-1,
"asdas"=>"asdasd", "qwe"=>"rty", ""=>"")));
+
+$a = array(""=>""); $b = -1;
+var_dump(filter_var_array($a, $b));
+var_dump($a, $b);
+
+$a = array(""=>""); $b = 100000;
+var_dump(filter_var_array($a, $b));
+var_dump($a, $b);
+
+$a = array(""=>""); $b = "";
+var_dump(filter_var_array($a, $b));
+var_dump($a, $b);
+
echo "Done\n";
?>
--EXPECTF--
@@ -99,4 +112,28 @@
[""]=>
NULL
}
+array(1) {
+ [""]=>
+ string(0) ""
+}
+array(1) {
+ [""]=>
+ string(0) ""
+}
+int(-1)
+array(1) {
+ [""]=>
+ string(0) ""
+}
+array(1) {
+ [""]=>
+ string(0) ""
+}
+int(100000)
+bool(false)
+array(1) {
+ [""]=>
+ string(0) ""
+}
+string(0) ""
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
