summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-05-23 13:39:00 +0800
committerStanislav Malyshev <stas@php.net>2012-05-23 18:45:03 -0500
commit0eb02b874de8c97b6ee4c4226a95971e1d4d27ff (patch)
tree7e2348a2c3eb680939499662bc99b6ccebf77060
parentb595b775f771543a7d3d675e16179a5e13aff468 (diff)
downloadphp-git-0eb02b874de8c97b6ee4c4226a95971e1d4d27ff.tar.gz
Revert "Implemented FR #61602 Allow access to name of constant used as default value"
This reverts commit 054f3e3ce5af13c2c3a6ccd54f7dc3e2f6cd4f74. See: http://news.php.net/php.cvs/69137 and the author confirmed. Will commit later after the author fixed this then make a new PR. Conflicts: ext/reflection/php_reflection.c
-rw-r--r--ext/reflection/php_reflection.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 406da93823..fe50289e2f 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -2588,6 +2588,15 @@ ZEND_METHOD(reflection_parameter, getDefaultValue)
if (!(param && precv)) {
return;
}
+ if (param->offset < param->required) {
+ zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Parameter is not optional");
+ return;
+ }
+ precv = _get_recv_op((zend_op_array*)param->fptr, param->offset);
+ if (!precv || precv->opcode != ZEND_RECV_INIT || precv->op2_type == IS_UNUSED) {
+ zend_throw_exception_ex(reflection_exception_ptr, 0 TSRMLS_CC, "Internal error");
+ return;
+ }
*return_value = *precv->op2.zv;
INIT_PZVAL(return_value);