RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

LibJS: Don't try to derive function source from ProxyObject

Browse source 
There are three JS::Function types that are not ScriptFunction:
NativeFunction, BoundFunction and ProxyObject. We were only checking for
the first two when determining whether to reconstruct the function's
source code, which was leading to a bad cast to ScriptFunction.

Since only ScriptFunction has the [[SourceText]] internal slot, I simply
swapped the branches here.

Fixes #5775.
This commit is contained in:
Linus Groh 2021-03-14 19:00:53 +01:00 • committed by Andreas Kling
parent 02b4cb96f8
commit f9287fca1e
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Userland/Libraries/LibJS/Runtime/FunctionPrototype.cpp
View file

@ -146,12 +146,11 @@ JS_DEFINE_NATIVE_FUNCTION(FunctionPrototype::to_string)
String function_parameters = ""; String function_parameters = "";
String function_body; String function_body;
if (is<NativeFunction>(this_object) || is<BoundFunction>(this_object)) { if (is<ScriptFunction>(this_object)) {
function_body = String::formatted(" [{}]", this_object->class_name()); auto& script_function = static_cast<ScriptFunction&>(*this_object);
} else {
StringBuilder parameters_builder; StringBuilder parameters_builder;
auto first = true; auto first = true;
for (auto& parameter : static_cast<ScriptFunction*>(this_object)->parameters()) { for (auto& parameter : script_function.parameters()) {
if (!first) if (!first)
parameters_builder.append(", "); parameters_builder.append(", ");
first = false; first = false;
@ -166,6 +165,8 @@ JS_DEFINE_NATIVE_FUNCTION(FunctionPrototype::to_string)
// auto& body = static_cast<ScriptFunction*>(this_object)->body(); // auto& body = static_cast<ScriptFunction*>(this_object)->body();
// function_body = body.to_source(); // function_body = body.to_source();
function_body = " ???"; function_body = " ???";
} else {
function_body = String::formatted(" [{}]", this_object->class_name());
} }
auto function_source = String::formatted( auto function_source = String::formatted(