diff options
| author | Antony Dovgal <tony2001@php.net> | 2009-12-24 13:07:33 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2009-12-24 13:07:33 +0000 |
| commit | 0b8839cd4a40c00cf87b8041a2ad54f217775cc6 (patch) | |
| tree | 451feaeae22b0d48aeb468c6ea060c4dab88d3c3 | |
| parent | d55669c6ab7842ffe771cc36a3eee5a10082cf09 (diff) | |
| download | php-git-0b8839cd4a40c00cf87b8041a2ad54f217775cc6.tar.gz | |
fix the fix for #47409
use correct comparison and add missing scope checks to trunk
| -rw-r--r-- | ext/standard/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |