diff options
| author | Jerome Loyet <fat@php.net> | 2012-06-01 11:30:49 +0200 |
|---|---|---|
| committer | Jerome Loyet <fat@php.net> | 2012-06-01 11:30:49 +0200 |
| commit | 1fa8ecd082607858084994ad7081ef06e37db5f5 (patch) | |
| tree | 1fec830a259d4de551dc0a0f77d253821d923e20 /ext/reflection/php_reflection.c | |
| parent | 238caeb63c4f4faf67b9f8de62a753eb3e954dbe (diff) | |
| parent | b548d9ad2e02f3f216320b5f47e26046021a5bac (diff) | |
| download | php-git-1fa8ecd082607858084994ad7081ef06e37db5f5.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (27 commits)
Fixed Bug #62202 (ReflectionParameter::getDefaultValue() memory leaks with constant)
sort NEWS
fix bug #55042 - erealloc without updating pointer
Fix bug #62186 readline fails to compile
fix unchecked emalloc (cherry picked from commit 158d8a6b088662ce9d31e0c777c6ebe90efdc854)
fix test
fix test
Typofix in comment in proc_open.c
fix CVE-2012-2143
updated the libmagic patch after Felipes regex fix
Fix bug #62150 Test Bug - ext/fileinfo/tests/finfo_open_error.phpt
Bug #62177 deactivate the linux test version on win
Fix bug #62177 Test Bug - finfo_file_regex.phpt
Fixed bug #62176 Test Bug - sapi/cli/tests/bug61546.phpt
fix unchecked emalloc
add CVE
add bug 62146
add bug #62082
sync with HEAD
sync with HEAD
...
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 1cf65cee16..9346587eb7 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -2561,7 +2561,8 @@ ZEND_METHOD(reflection_parameter, getDefaultValue) *return_value = *precv->op2.zv; INIT_PZVAL(return_value); - if (Z_TYPE_P(return_value) != IS_CONSTANT && Z_TYPE_P(return_value) != IS_CONSTANT_ARRAY) { + if ((Z_TYPE_P(return_value) & IS_CONSTANT_TYPE_MASK) != IS_CONSTANT + && (Z_TYPE_P(return_value) & IS_CONSTANT_TYPE_MASK) != IS_CONSTANT_ARRAY) { zval_copy_ctor(return_value); } zval_update_constant_ex(&return_value, (void*)0, param->fptr->common.scope TSRMLS_CC); |