From 018be97c0d324453e7505d62f4a39fd202089cce Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 6 Mar 2014 00:15:56 +0400 Subject: Fixed support for undefined constants in RECV_INIT --- Zend/zend_execute_API.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Zend/zend_execute_API.c') 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 { -- cgit v1.2.1