LibJS: Fix crashing exception in Value::ordinary_has_instance()
Two issues: - throw_exception() with ErrorType::InstanceOfOperatorBadPrototype would receive rhs_prototype.to_string_without_side_effects(), which would ASSERT_NOT_REACHED() as to_string_without_side_effects() must not be called on an empty value. It should (and now does) receive the RHS value instead as the message is "'prototype' property of {} is not an object". - Value::instance_of() was missing an exception check after calling has_instance_method, to_boolean() on an empty value result would crash as well. Fixes #3930.
This commit is contained in:
parent
c538e22516
commit
565a26808d
Notes:
sideshowbarker
2024-07-19 01:34:15 +09:00
Author: https://github.com/linusg Commit: https://github.com/SerenityOS/serenity/commit/565a26808dc Pull-request: https://github.com/SerenityOS/serenity/pull/3937 Issue: https://github.com/SerenityOS/serenity/issues/3930
2 changed files with 17 additions and 3 deletions
|
@ -711,8 +711,10 @@ Value instance_of(GlobalObject& global_object, Value lhs, Value rhs)
|
|||
vm.throw_exception<TypeError>(global_object, ErrorType::NotAFunction, has_instance_method.to_string_without_side_effects());
|
||||
return {};
|
||||
}
|
||||
|
||||
return Value(vm.call(has_instance_method.as_function(), rhs, lhs).to_boolean());
|
||||
auto has_instance_result = vm.call(has_instance_method.as_function(), rhs, lhs);
|
||||
if (vm.exception())
|
||||
return {};
|
||||
return Value(has_instance_result.to_boolean());
|
||||
}
|
||||
|
||||
if (!rhs.is_function()) {
|
||||
|
@ -743,7 +745,7 @@ Value ordinary_has_instance(GlobalObject& global_object, Value lhs, Value rhs)
|
|||
return {};
|
||||
|
||||
if (!rhs_prototype.is_object()) {
|
||||
vm.throw_exception<TypeError>(global_object, ErrorType::InstanceOfOperatorBadPrototype, rhs_prototype.to_string_without_side_effects());
|
||||
vm.throw_exception<TypeError>(global_object, ErrorType::InstanceOfOperatorBadPrototype, rhs.to_string_without_side_effects());
|
||||
return {};
|
||||
}
|
||||
while (true) {
|
||||
|
|
|
@ -22,3 +22,15 @@ test("derived ES5 classes", () => {
|
|||
expect(d instanceof Derived).toBeTrue();
|
||||
expect(d instanceof Base).toBeTrue();
|
||||
});
|
||||
|
||||
test("issue #3930, instanceof on arrow function", () => {
|
||||
function f() {}
|
||||
const a = () => {};
|
||||
|
||||
expect(() => {
|
||||
f instanceof a;
|
||||
}).toThrow(TypeError);
|
||||
expect(() => {
|
||||
a instanceof a;
|
||||
}).toThrow(TypeError);
|
||||
});
|
||||
|
|
Loading…
Add table
Reference in a new issue