From: Antony Dovgal Date: Thu, 24 Dec 2009 13:07:33 +0000 (+0000) Subject: fix the fix for #47409 X-Git-Tag: php-5.4.0alpha1~518 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b8839cd4a40c00cf87b8041a2ad54f217775cc6;p=php fix the fix for #47409 use correct comparison and add missing scope checks to trunk --- diff --git a/ext/standard/array.c b/ext/standard/array.c index 3c16d77f3c..3ffd4a0369 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -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);