jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug in v8 ctor emitter.

Browse source 
This bug leaded to flaky crashes of v8 engine.

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13807 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Oliver Buchtala 2012-09-08 01:10:42 +00:00
commit a4f8e4c1c3
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/javascript/v8/javascriptcode.swg
View file

@ -5,7 +5,8 @@ v8::Handle<v8::Value> $jswrapper(const v8::Arguments& args) {
$jslocals $jslocals
$jscode $jscode
return SWIG_V8_NewPointerObj(result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN); SWIG_V8_SetPrivateData(self, result, SWIGTYPE_$jsmangledtype, SWIG_POINTER_OWN);
return scope.Close(self);
goto fail; goto fail;
fail: fail:
@ -54,10 +55,12 @@ fail:
return scope.Close(v8::Undefined()); return scope.Close(v8::Undefined());
}%} }%}
/*
%fragment ("JS_mainctordefn", "templates") %fragment ("JS_mainctordefn", "templates")
%{ %{
// TODO: implement JS_mainctordefn // TODO: implement JS_mainctordefn
%} %}
*/
%fragment ("JS_ctor_dispatch_case", "templates") %fragment ("JS_ctor_dispatch_case", "templates")
%{ %{

18
Lib/javascript/v8/javascriptruntime.swg
View file

@ -77,6 +77,15 @@ int SWIG_V8_ConvertInstancePtr(v8::Handle<v8::Object> objRef, void** ptr, swig_t
return SWIG_OK; return SWIG_OK;
} }
void SWIG_V8_SetPrivateData(v8::Handle<v8::Object> obj, void* ptr, swig_type_info *info, int flags) {
SWIG_PRV_DATA* cdata = (SWIG_PRV_DATA*) new SWIG_PRV_DATA;
cdata->swigCObject = ptr;
cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
cdata->info = info;
obj->SetInternalField(0, v8::External::New(cdata));
}
int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) { int SWIG_V8_ConvertPtr(v8::Handle<v8::Value> valRef, void** ptr, swig_type_info *info, int flags) {
if(!valRef->IsObject()) { if(!valRef->IsObject()) {
return SWIG_TypeError; return SWIG_TypeError;
@ -103,14 +112,9 @@ v8::Handle<v8::Object> SWIG_V8_NewPointerObj(void *ptr, swig_type_info *info, in
} }
v8::Local<v8::Object> result = inst_templ->NewInstance(); v8::Local<v8::Object> result = inst_templ->NewInstance();
SWIG_PRV_DATA* cdata = (SWIG_PRV_DATA*) new SWIG_PRV_DATA;
cdata->swigCObject = ptr;
cdata->swigCMemOwn = (flags & SWIG_POINTER_OWN) ? 1 : 0;
cdata->info = info;
result->SetInternalField(0, v8::External::New(cdata));
SWIG_V8_SetPrivateData(result, ptr, info, flags);
return scope.Close(result); return scope.Close(result);
} }