github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-17 02:21:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

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();
}
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)
object->Wrap(isolate, args->GetThis());
else

12
native_mate/constructor.h.pump
View File

@@ -92,7 +92,17 @@ class Constructor {
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)
object->Wrap(isolate, args->GetThis());
else