From c2fa809debeff6cbbb0a17a09bea0dde72dec91d Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Thu, 24 Dec 2009 13:07:33 +0000 Subject: [PATCH] fix the fix for #47409 use correct comparison and add missing scope checks to trunk --- ext/standard/array.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/array.c b/ext/standard/array.c index 1c78cab2e8..5ed0862abb 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -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); -- 2.50.1