From: Antony Dovgal <tony2001@php.net>
Date: Mon, 13 Nov 2006 19:32:43 +0000 (+0000)
Subject: improve the fix and the test
X-Git-Tag: RELEASE_1_0_0RC1~1027
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a7f43cfa007b1550eae91f885b64fa0a16b11eb;p=php

improve the fix and the test
---

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 56f2c27818..0fc5cc01a6 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -615,14 +615,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 7a3ac9346f..8b2d31e213 100644
--- 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