Chromium Code Reviews| Index: src/objects.cc |
| diff --git a/src/objects.cc b/src/objects.cc |
| index 21784c0f0bf71f51f67515cc7b8dec27878cf107..e2973dacb901d5a36b5480114b661ca7c20b4849 100644 |
| --- a/src/objects.cc |
| +++ b/src/objects.cc |
| @@ -178,6 +178,15 @@ MaybeObject* JSObject::GetPropertyWithCallback(Object* receiver, |
| // api style callbacks. |
| if (structure->IsAccessorInfo()) { |
| AccessorInfo* data = AccessorInfo::cast(structure); |
| + if (!data->IsCompatibleReceiver(receiver)) { |
| + Handle<Object> name_handle(name); |
| + Handle<Object> receiver_handle(receiver); |
| + Handle<Object> args[2] = { name_handle, receiver_handle }; |
| + Handle<Object> error = |
| + isolate->factory()->NewTypeError("incompatible_method_receiver", |
| + HandleVector(args, 2)); |
| + return isolate->Throw(*error); |
| + } |
| Object* fun_obj = data->getter(); |
| v8::AccessorGetter call_fun = v8::ToCData<v8::AccessorGetter>(fun_obj); |
| HandleScope scope(isolate); |
| @@ -1984,6 +1993,15 @@ MaybeObject* JSObject::SetPropertyWithCallback(Object* structure, |
| if (structure->IsAccessorInfo()) { |
| // api style callbacks |
| AccessorInfo* data = AccessorInfo::cast(structure); |
| + if (!data->IsCompatibleReceiver(this)) { |
| + Handle<Object> name_handle(name); |
| + Handle<Object> receiver_handle(this); |
| + Handle<Object> args[2] = { name_handle, receiver_handle }; |
| + Handle<Object> error = |
| + isolate->factory()->NewTypeError("incompatible_method_receiver", |
| + HandleVector(args, 2)); |
|
Sven Panne
2012/06/04 07:50:32
2 => ARRAY_SIZE(args)
Michael Starzinger
2012/06/04 09:11:15
Done.
|
| + return isolate->Throw(*error); |
| + } |
| Object* call_obj = data->setter(); |
| v8::AccessorSetter call_fun = v8::ToCData<v8::AccessorSetter>(call_obj); |
| if (call_fun == NULL) return value; |