mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix leaks with class constants (bug #24699)

Browse Source
This commit is contained in:
Stanislav Malyshev 2003-07-27 12:03:54 +00:00
parent 78f8ca6e55
commit 5724c7a66c
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_compile.c
View File

@ -2513,6 +2513,7 @@ void zend_do_fold_constant(znode *result, znode *constant_name TSRMLS_DC)
if (zend_hash_find(&CG(active_class_entry)->constants_table, constant_name->u.constant.value.str.val,
constant_name->u.constant.value.str.len+1, (void **) &zresult) != SUCCESS) {
if (zend_get_constant(constant_name->u.constant.value.str.val, constant_name->u.constant.value.str.len, &result->u.constant TSRMLS_CC)) {
zval_dtor(&constant_name->u.constant);
return;
} else {
zend_error(E_COMPILE_ERROR, "Cannot find %s constant in class %s\n",
@ -2522,6 +2523,7 @@ void zend_do_fold_constant(znode *result, znode *constant_name TSRMLS_DC)
result->u.constant = **zresult;
zval_copy_ctor(&result->u.constant);
zval_dtor(&constant_name->u.constant);
}
void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode TSRMLS_DC)

2
Zend/zend_constants.c
View File

@ -288,6 +288,8 @@ ZEND_API int zend_get_constant(char *name, uint name_len, zval *result TSRMLS_DC
if (retval) {
*result = c->value;
zval_copy_ctor(result);
result->refcount = 1;
result->is_ref = 0;
}
return retval;