php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-30 04:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'global' implementation (fixes, at least, bug #24396

Browse Source
This commit is contained in:
Zeev Suraski
2003-06-30 13:47:12 +00:00
parent dcaf0ee650
commit 6f9d0da2e5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_execute.c
View File

@@ -646,11 +646,6 @@ static inline HashTable *zend_get_target_symbol_table(zend_op *opline, temp_vari
return EG(active_symbol_table);
break;
case ZEND_FETCH_GLOBAL:
/* Don't think this is actually needed.
if (opline->op1.op_type == IS_VAR) {
PZVAL_LOCK(varname);
}
+ */
return &EG(symbol_table);
break;
case ZEND_FETCH_STATIC:
@@ -687,6 +682,9 @@ static void zend_fetch_var_address(zend_op *opline, temp_variable *Ts, int type
target_symbol_table = NULL;
retval = zend_std_get_static_property(T(opline->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC);
} else {
if (opline->op2.u.EA.type == ZEND_FETCH_GLOBAL && opline->op1.op_type == IS_VAR) {
PZVAL_LOCK(varname);
}
target_symbol_table = zend_get_target_symbol_table(opline, Ts, type, varname TSRMLS_CC);
if (!target_symbol_table) {
return;