RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 22:54:57 +00:00
Code Issues Activity Actions

LibJS: Handle non-string primitive values in Object::to_string()

Browse source
This commit is contained in:
Linus Groh 2020-04-29 16:36:38 +01:00 • committed by Andreas Kling
parent 2c6e7dbd07
commit 4bdb6daac5
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Libraries/LibJS/Runtime/Object.cpp
View file

@ -361,12 +361,12 @@ Value Object::to_string() const
&& to_string_property.as_object().is_function()) { && to_string_property.as_object().is_function()) {
auto& to_string_function = static_cast<Function&>(to_string_property.as_object()); auto& to_string_function = static_cast<Function&>(to_string_property.as_object());
auto& interpreter = const_cast<Object*>(this)->interpreter(); auto& interpreter = const_cast<Object*>(this)->interpreter();
auto string_value = interpreter.call(to_string_function, const_cast<Object*>(this)); auto to_string_result = interpreter.call(to_string_function, const_cast<Object*>(this));
if (!string_value.is_string()) if (to_string_result.is_object())
interpreter.throw_exception<TypeError>("Cannot convert object to string"); interpreter.throw_exception<TypeError>("Cannot convert object to string");
if (interpreter.exception()) if (interpreter.exception())
return {}; return {};
return string_value; return js_string(heap(), to_string_result.to_string());
} }
return js_string(heap(), String::format("[object %s]", class_name())); return js_string(heap(), String::format("[object %s]", class_name()));
} }