mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix ignored exception thrown from constructor.

Browse source
This commit is contained in:
Cheng Zhao 2015-01-04 22:13:19 -08:00
parent be2934d9b5
commit 753d5675dd
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
native_mate/constructor.h
View file

@ -156,7 +156,17 @@ class Constructor {
MATE_METHOD_RETURN_UNDEFINED(); MATE_METHOD_RETURN_UNDEFINED();
} }
Wrappable* object = internal::InvokeFactory(args, factory); Wrappable* object;
{
// Don't continue if the constructor throws an exception.
v8::TryCatch try_catch;
object = internal::InvokeFactory(args, factory);
if (try_catch.HasCaught()) {
try_catch.ReThrow();
MATE_METHOD_RETURN_UNDEFINED();
}
}
if (object) if (object)
object->Wrap(isolate, args->GetThis()); object->Wrap(isolate, args->GetThis());
else else

12
native_mate/constructor.h.pump
View file

@ -92,7 +92,17 @@ class Constructor {
MATE_METHOD_RETURN_UNDEFINED(); MATE_METHOD_RETURN_UNDEFINED();
} }
Wrappable* object = internal::InvokeFactory(args, factory); Wrappable* object;
{
// Don't continue if the constructor throws an exception.
v8::TryCatch try_catch;
object = internal::InvokeFactory(args, factory);
if (try_catch.HasCaught()) {
try_catch.ReThrow();
MATE_METHOD_RETURN_UNDEFINED();
}
}
if (object) if (object)
object->Wrap(isolate, args->GetThis()); object->Wrap(isolate, args->GetThis());
else else