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

LibJS: Stop overwriting existing accessors in Object::define_property

Browse source
This commit is contained in:
Idan Horowitz 2021-06-17 14:15:50 +03:00 • committed by Linus Groh
parent 1cf5663e38
commit a85a95fe8d
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibJS/Runtime/Object.cpp
View file

@ -480,11 +480,16 @@ bool Object::define_property(const StringOrSymbol& property_name, const Object&
Function* getter_function { nullptr }; Function* getter_function { nullptr };
Function* setter_function { nullptr }; Function* setter_function { nullptr };
auto existing_property = get_without_side_effects(property_name).value_or(js_undefined());
if (getter.is_function()) { if (getter.is_function()) {
getter_function = &getter.as_function(); getter_function = &getter.as_function();
} else if (!getter.is_undefined()) { } else if (!getter.is_undefined()) {
vm.throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "get"); vm.throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "get");
return false; return false;
} else if (existing_property.is_accessor()) {
// FIXME: This is a hack, since we store Accessor as a getter & setter tuple value, instead of as separate entries in the property
getter_function = existing_property.as_accessor().getter();
} }
if (setter.is_function()) { if (setter.is_function()) {
@ -492,6 +497,9 @@ bool Object::define_property(const StringOrSymbol& property_name, const Object&
} else if (!setter.is_undefined()) { } else if (!setter.is_undefined()) {
vm.throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "set"); vm.throw_exception<TypeError>(global_object(), ErrorType::AccessorBadField, "set");
return false; return false;
} else if (existing_property.is_accessor()) {
// FIXME: See above
setter_function = existing_property.as_accessor().setter();
} }
dbgln_if(OBJECT_DEBUG, "Defining new property {} with accessor descriptor {{ attributes={}, getter={}, setter={} }}", property_name.to_display_string(), attributes, getter, setter); dbgln_if(OBJECT_DEBUG, "Defining new property {} with accessor descriptor {{ attributes={}, getter={}, setter={} }}", property_name.to_display_string(), attributes, getter, setter);