diff options
| author | Felipe Pena <felipe@php.net> | 2010-05-25 22:46:17 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-05-25 22:46:17 +0000 |
| commit | f3009cb59604bfe0281153f64caa9d113444c54d (patch) | |
| tree | c20b91ee428181dbf4beaea43c8b722a7c27aefc | |
| parent | c5ff0eb5b8dfcc90647fae949dc3f0163693ffcd (diff) | |
| download | php-git-f3009cb59604bfe0281153f64caa9d113444c54d.tar.gz | |
- Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with constant array)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/reflection/php_reflection.c | 2 | ||||
| -rw-r--r-- | ext/reflection/tests/bug51911.phpt | 22 |
3 files changed, 25 insertions, 1 deletions
@@ -62,6 +62,8 @@ PHP NEWS requests (Fixes CVE-2010-0397, bug #51288). (Raphael Geissert) - Fixed 64-bit integer overflow in mhash_keygen_s2k(). (Clément LECIGNE, Stas) +- Fixed bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with + constant array). (Felipe) - Fixed bug #51844 (checkdnsrr does not support types other than MX). (Pierre) - Fixed bug #51827 (Bad warning when register_shutdown_function called with wrong num of parameters). (Felipe) diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 98928b3b0e..6a35bf54c2 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2408,7 +2408,7 @@ ZEND_METHOD(reflection_parameter, getDefaultValue) *return_value = precv->op2.u.constant; INIT_PZVAL(return_value); - if (Z_TYPE_P(return_value) != IS_CONSTANT) { + if (Z_TYPE_P(return_value) != IS_CONSTANT && Z_TYPE_P(return_value) != IS_CONSTANT_ARRAY) { zval_copy_ctor(return_value); } zval_update_constant_ex(&return_value, (void*)0, param->fptr->common.scope TSRMLS_CC); diff --git a/ext/reflection/tests/bug51911.phpt b/ext/reflection/tests/bug51911.phpt new file mode 100644 index 0000000000..12eb459fbc --- /dev/null +++ b/ext/reflection/tests/bug51911.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #51911 (ReflectionParameter::getDefaultValue() memory leaks with constant array) +--FILE-- +<?php + +class Foo { + const X = 1; + public function x($x = array(1)) {} +} + +$clazz = new ReflectionClass('Foo'); +$method = $clazz->getMethod('x'); +foreach ($method->getParameters() as $param) { + if ( $param->isDefaultValueAvailable()) + echo '$', $param->getName(), ' : ', var_export($param->getDefaultValue(), 1), "\n"; +} + +?> +--EXPECT-- +$x : array ( + 0 => 1, +) |