MFH: improve the fix and the test

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 691e1d265e2500b6149c7020d7bc42700dbed752..246fb67f18c95706d74bb5964f6127659eea6d99 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -607,14 +607,16 @@ static void php_filter_array_handler(zval *input, zval **op, zval *return_value
        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);

diff --git a/ext/filter/tests/039.phpt b/ext/filter/tests/039.phpt
index 7a3ac9346fc53eb3cae2afd5d2b27817f3451c67..8b2d31e213c4ee9591f5d4c40357ca334a45cf52 100644 (file)
--- a/ext/filter/tests/039.phpt
+++ b/ext/filter/tests/039.phpt
@@ -28,6 +28,19 @@ var_dump(filter_var_array(array("var_name"=>""), array("var_name"=>-1)));
 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 @@ array(4) {
   [""]=>
   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