AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

callback handler map not correctly populated by direct use of SetCallHandler

Browse Source 
R=svenpanne@chromium.org
BUG=

Review URL: https://codereview.chromium.org/15814005

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14789 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
dcarney@chromium.org 2013-05-24 07:59:33 +00:00
parent 22a336c13e
commit 91efd1e7d7
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api.cc
View File

@ -982,7 +982,7 @@ void FunctionTemplate::Inherit(v8::Handle<FunctionTemplate> value) {
template<typename Callback>
static Local<FunctionTemplate> FunctionTemplateNew(
Callback callback_in,
Callback callback,
v8::Handle<Value> data,
v8::Handle<Signature> signature,
int length) {
@ -998,10 +998,8 @@ static Local<FunctionTemplate> FunctionTemplateNew(
int next_serial_number = isolate->next_serial_number();
isolate->set_next_serial_number(next_serial_number + 1);
obj->set_serial_number(i::Smi::FromInt(next_serial_number));
if (callback_in != 0) {
if (callback != 0) {
if (data.IsEmpty()) data = v8::Undefined();
InvocationCallback callback =
i::CallbackTable::Register(isolate, callback_in);
Utils::ToLocal(obj)->SetCallHandler(callback, data);
}
obj->set_length(length);
@ -1225,7 +1223,7 @@ int TypeSwitch::match(v8::Handle<Value> value) {
template<typename Callback>
static void FunctionTemplateSetCallHandler(FunctionTemplate* function_template,
Callback callback,
Callback callback_in,
v8::Handle<Value> data) {
i::Isolate* isolate = Utils::OpenHandle(function_template)->GetIsolate();
if (IsDeadCheck(isolate, "v8::FunctionTemplate::SetCallHandler()")) return;
@ -1235,6 +1233,8 @@ static void FunctionTemplateSetCallHandler(FunctionTemplate* function_template,
isolate->factory()->NewStruct(i::CALL_HANDLER_INFO_TYPE);
i::Handle<i::CallHandlerInfo> obj =
i::Handle<i::CallHandlerInfo>::cast(struct_obj);
InvocationCallback callback =
i::CallbackTable::Register(isolate, callback_in);
SET_FIELD_WRAPPED(obj, set_callback, callback);
if (data.IsEmpty()) data = v8::Undefined();
obj->set_data(*Utils::OpenHandle(*data));

7
test/cctest/test-api.cc
View File

@ -40,6 +40,7 @@
#include "v8.h"
#include "api.h"
#include "arguments.h"
#include "isolate.h"
#include "compilation-cache.h"
#include "execution.h"
@ -908,6 +909,12 @@ static void TestFunctionTemplateInitializer(Handler handler) {
CHECK_EQ(102, script->Run()->Int32Value());
}
}
// Blow away handler database
i::Isolate* isolate = i::Isolate::Current();
if (isolate->callback_table() != NULL) {
delete isolate->callback_table();
isolate->set_callback_table(NULL);
}
// Use SetCallHandler to initialize a function template, should work like the
// previous one.
{