Call "join" property instead of hardcoding Ap_join in Ap_toString.

artifex-tor · artifex-tor · commit dbb86fcd8b6a · 2021-04-23T11:13:50.000+02:00
diff --git a/jsarray.c b/jsarray.c
@@ -423,9 +423,18 @@ static void Ap_unshift(js_State *J)
 
 static void Ap_toString(js_State *J)
 {
-	int top = js_gettop(J);
-	js_pop(J, top - 1);
-	Ap_join(J);
+	if (!js_iscoercible(J, 0))
+		js_typeerror(J, "'this' is not an object");
+	js_getproperty(J, 0, "join");
+	if (!js_iscallable(J, -1)) {
+		// TODO: call Object.prototype.toString implementation; not via Object.toString JS objects
+		js_getglobal(J, "Object");
+		js_getproperty(J, -1, "toString");
+		js_rot2pop1(J);
+	}
+	js_copy(J, 0);
+	js_call(J, 0);
+	js_pop(J, 1);
 }
 
 static void Ap_indexOf(js_State *J)
