php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 18:22:42 +01: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 139c26f795
commit c2fa809deb
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/array.c
View File

@@ -1445,7 +1445,7 @@ PHP_FUNCTION(extract)
if (var_exists && var_name_len == sizeof("GLOBALS") && ZEND_U_EQUAL(key_type, var_name, var_name_len - 1, "GLOBALS", sizeof("GLOBALS") - 1)) {
break;
}
if (var_exists && var_name_len == sizeof("this") && ZEND_U_EQUAL(key_type, var_name, var_name_len - 1, "this", sizeof("this") - 1)) {
if (var_exists && var_name_len == sizeof("this") && ZEND_U_EQUAL(key_type, var_name, var_name_len - 1, "this", sizeof("this") - 1) && EG(scope) && EG(scope)->name_length != 0) {
break;
}
ZVAL_ZSTRL(&final_name, key_type, var_name, var_name_len, 1);