diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-03-06 00:15:56 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-03-06 00:15:56 +0400 |
| commit | 018be97c0d324453e7505d62f4a39fd202089cce (patch) | |
| tree | ba4c4f74bb7d356e0073b9f5b491454d6c3f96f5 /Zend/zend_execute_API.c | |
| parent | 712dd6c68e2d187cdda1c8eb46f2b8039487557c (diff) | |
| download | php-git-018be97c0d324453e7505d62f4a39fd202089cce.tar.gz | |
Fixed support for undefined constants in RECV_INIT
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 0d3637a937..02030ff413 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -531,17 +531,16 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope zend_error(E_ERROR, "Undefined constant '%s'", save->val); } if (inline_change) { -//??? STR_RELEASE(save); + STR_RELEASE(save); } save = NULL; } - if (inline_change && save && save->val != actual) { -//??? STR_RELEASE(save); - } zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", actual, actual); p->type = IS_STRING; if (!inline_change) { ZVAL_STRINGL(p, actual, actual_len); + } else if (save) { + STR_RELEASE(save); } } } else { |