mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-25 09:49:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix the fix for #47409

Browse Source 
use correct comparison and add missing scope checks to trunk
This commit is contained in:
Antony Dovgal 2009-12-24 13:07:33 +00:00
parent d55669c6ab
commit 0b8839cd4a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/array.c
View File

@ -1383,7 +1383,7 @@ PHP_FUNCTION(extract)
if (var_exists && var_name_len == sizeof("GLOBALS") && !strcmp(var_name, "GLOBALS")) {
break;
}
if (var_exists && var_name_len == sizeof("this") && !strcmp(var_name, "this") && EG(scope) && "" != EG(scope)->name) {
if (var_exists && var_name_len == sizeof("this") && !strcmp(var_name, "this") && EG(scope) && EG(scope)->name_length != 0) {
break;
}
ZVAL_STRINGL(&final_name, var_name, var_name_len, 1);