patch from mozilla#1287

HtmlUnit · Jan 4, 2023 · 21a4e0b · 21a4e0b
1 parent 259d63f
commit 21a4e0b
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/org/mozilla/javascript/BoundFunction.java b/src/org/mozilla/javascript/BoundFunction.java
@@ -52,7 +52,15 @@ public BoundFunction(
 
     @Override
     public Object call(Context cx, Scriptable scope, Scriptable thisObj, Object[] extraArgs) {
-        Scriptable callThis = boundThis != null ? boundThis : ScriptRuntime.getTopCallScope(cx);
+        // Scriptable callThis = boundThis != null ? boundThis : ScriptRuntime.getTopCallScope(cx);
+        // see https://github.com/mozilla/rhino/pull/1287
+        Scriptable callThis = boundThis;
+        if (callThis == null && ScriptRuntime.hasTopCall(cx)) {
+            callThis = ScriptRuntime.getTopCallScope(cx);
+        }
+        if (callThis == null) {
+            callThis = getTopLevelScope(scope);
+        }
         return targetFunction.call(cx, scope, callThis, concat(boundArgs, extraArgs));
     }