merge r292594: fix the fix for #47409 (tony2001)

diff --git a/ext/standard/array.c b/ext/standard/array.c
index 2d29984da6ff42d821484d80ae0753845bdcb3cc..1988ea3a4483ec7e0438934ad13e17533ce43996 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);