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 3c16d77f3c4b06ea814c5d73e5fb3bcbd3867811..3ffd4a0369ab858c5f9f0d967fcbdf7e837268bb 100644 (file)
--- 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);