summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Dovgal <tony2001@php.net>2005-08-11 21:32:57 +0000
committerAntony Dovgal <tony2001@php.net>2005-08-11 21:32:57 +0000
commitb58f366c5cba553eff7889e8b4e121d30e6633c9 (patch)
tree72477c4181b34a3159edce08c045995769efa2ec
parentef36d692cd08b9bc647f167b220e900cf792b41e (diff)
downloadphp-git-b58f366c5cba553eff7889e8b4e121d30e6633c9.tar.gz
MF5.1: fix #34078 (Reflection API problems in methods with boolean or null default values)
(andrei said to sara a few hours ago you may commit whatever you want until 9pm) (c) helly if there are any problems with this patch - please tell me, I'll revert it immediately
-rw-r--r--NEWS2
-rw-r--r--Zend/zend_reflection_api.c2
-rw-r--r--ext/reflection/php_reflection.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 36b6a93022..94d94b79b9 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ PHP NEWS
- Fixed "make test" to work for phpized extensions. (Hartmut, Jani)
- Fixed failing queries (FALSE returned) with mysqli_query() on 64 bit systems.
(Andrey)
+- Fixed bug #34078 (Reflection API problems in methods with boolean or null
+ default values). (Tony)
- Fixed bug #34064 (arr[] as param to function in class gives invalid opcode).
(Dmitry)
- Fixed bug #34062 (Crash in catch block when many arguments are used).
diff --git a/Zend/zend_reflection_api.c b/Zend/zend_reflection_api.c
index 6034af75ce..2bbd91bc98 100644
--- a/Zend/zend_reflection_api.c
+++ b/Zend/zend_reflection_api.c
@@ -1864,7 +1864,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
zv_copy = precv->op2.u.constant;
zv = &zv_copy;
- zval_update_constant(&zv, (void*)1 TSRMLS_CC);
+ zval_update_constant(&zv, (void*)0 TSRMLS_CC);
RETURN_ZVAL(zv, 1, 1);
}
/* }}} */
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 6034af75ce..2bbd91bc98 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1864,7 +1864,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
zv_copy = precv->op2.u.constant;
zv = &zv_copy;
- zval_update_constant(&zv, (void*)1 TSRMLS_CC);
+ zval_update_constant(&zv, (void*)0 TSRMLS_CC);
RETURN_ZVAL(zv, 1, 1);
}
/* }}} */