summaryrefslogtreecommitdiff
path: root/Zend/zend_execute_API.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2014-04-01 14:20:10 +0400
committerDmitry Stogov <dmitry@zend.com>2014-04-01 14:20:10 +0400
commit70b7950a75609c4386f996fe7cb1a005447262b4 (patch)
tree39808071069723297fdb5d6656ac554dc865dd1d /Zend/zend_execute_API.c
parent9b196ca6e872369263c55e66ceca0183f75d6420 (diff)
downloadphp-git-70b7950a75609c4386f996fe7cb1a005447262b4.tar.gz
Exclude interned flags from constant flags
Diffstat (limited to 'Zend/zend_execute_API.c')
-rw-r--r--Zend/zend_execute_API.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 363f401230..7400840a49 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -612,7 +612,7 @@ ZEND_API int zval_update_constant_ex(zval *p, void *arg, zend_class_entry *scope
zend_ast_destroy(ast->ast);
efree(ast);
//???
- } else if (!zend_get_constant_ex(str_index->val, str_index->len, &const_value, scope, str_index->gc.u.v.flags TSRMLS_CC)) {
+ } else if (!zend_get_constant_ex(str_index->val, str_index->len, &const_value, scope, str_index->gc.u.v.flags & ~(IS_STR_PERSISTENT | IS_STR_INTERNED |IS_STR_PERMANENT) TSRMLS_CC)) {
char *actual, *str;
const char *save = str_index->val;
int len;