mirrors/escargot
2
0
Fork 0
mirror of https://github.com/Samsung/escargot.git synced 2026-06-22 10:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add missing checks for targetDescriptor in ProxyObject::get (#245)

Browse source 
Check if the descriptor is dataDescriptor / accessorDescriptor.

Signed-off-by: Daniel Balla <dballa@inf.u-szeged.hu>
This commit is contained in:
Daniel Balla 2019-05-10 08:13:59 +02:00 • committed by yichoi
commit 94f8bfa24c
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/runtime/ProxyObject.cpp
View file

@ -681,16 +681,16 @@ ObjectGetResult ProxyObject::get(ExecutionState& state, const ObjectPropertyName
// 13. If targetDesc is not undefined, then
if (!targetDesc.value(state, target).isUndefined()) {
// a. TODO If IsDataDescriptor(targetDesc) and targetDesc.[[Configurable]] is false and targetDesc.[[Writable]] is false, then
if (!targetDesc.isConfigurable() && !targetDesc.isWritable()) {
// a. If IsDataDescriptor(targetDesc) and targetDesc.[[Configurable]] is false and targetDesc.[[Writable]] is false, then
if (targetDesc.isDataProperty() && !targetDesc.isConfigurable() && !targetDesc.isWritable()) {
// i. If SameValue(trapResult, targetDesc.[[Value]]) is false, throw a TypeError exception.
if (trapResult != targetDesc.value(state, target)) {
ErrorObject::throwBuiltinError(state, ErrorObject::TypeError, strings->Proxy.string(), false, String::emptyString, "%s: Proxy Type Error.");
return ObjectGetResult();
}
}
// b. TODO If IsAccessorDescriptor(targetDesc) and targetDesc.[[Configurable]] is false and targetDesc.[[Get]] is undefined, then
if (!targetDesc.isConfigurable() && (!targetDesc.jsGetterSetter()->hasGetter() || targetDesc.jsGetterSetter()->getter().isUndefined())) {
// b. If IsAccessorDescriptor(targetDesc) and targetDesc.[[Configurable]] is false and targetDesc.[[Get]] is undefined, then
if (!targetDesc.isDataProperty() && !targetDesc.isConfigurable() && (!targetDesc.jsGetterSetter()->hasGetter() || targetDesc.jsGetterSetter()->getter().isUndefined())) {
// i. If trapResult is not undefined, throw a TypeError exception.
if (!trapResult.isUndefined()) {
ErrorObject::throwBuiltinError(state, ErrorObject::TypeError, strings->Proxy.string(), false, String::emptyString, "%s: Proxy Type Error.");