more fallback

Author: ZZZank

rhino/src/main/java/org/mozilla/javascript/FunctionObject.java

@@ -80,7 +80,9 @@ public class FunctionObject extends BaseFunction {
      * @see org.mozilla.javascript.Scriptable
      */
     public FunctionObject(String name, Member methodOrConstructor, Scriptable scope) {
-        var typeInfoFactory = TypeInfoFactory.get(scope);
+        // fallback to global factory for compatibility with old behaviour, where the `scope` can be
+        // an object not yet initialized via `initStandardObject(...)`
+        var typeInfoFactory = TypeInfoFactory.getOrElse(scope, TypeInfoFactory.GLOBAL);
 
         if (methodOrConstructor instanceof Constructor) {
             member = new MemberBox((Constructor<?>) methodOrConstructor, typeInfoFactory);

rhino/src/main/java/org/mozilla/javascript/ScriptableObject.java

@@ -1499,10 +1499,11 @@ public void defineProperty(String propertyName, Class<?> clazz, int attributes)
      */
     public void defineProperty(
             String propertyName, Object delegateTo, Method getter, Method setter, int attributes) {
+        var typeFactory = TypeInfoFactory.getOrElse(this, TypeInfoFactory.GLOBAL);
+
         MemberBox getterBox = null;
         if (getter != null) {
-            getterBox =
-                    new MemberBox(getter, TypeInfoFactory.getOrElse(this, TypeInfoFactory.GLOBAL));
+            getterBox = new MemberBox(getter, typeFactory);
 
             boolean delegatedForm;
             if (!Modifier.isStatic(getter.getModifiers())) {
@@ -1543,7 +1544,7 @@ public void defineProperty(
             if (setter.getReturnType() != Void.TYPE)
                 throw Context.reportRuntimeErrorById("msg.setter.return", setter.toString());
 
-            setterBox = new MemberBox(setter, TypeInfoFactory.get(this));
+            setterBox = new MemberBox(setter, typeFactory);
 
             boolean delegatedForm;
             if (!Modifier.isStatic(setter.getModifiers())) {