n_api: fix fatalexception handling in workers

mafintosh · mafintosh · commit b082520b5564 · 2018-03-14T22:56:35.000+01:00
diff --git a/src/node_api.cc b/src/node_api.cc
@@ -3354,10 +3354,11 @@ class Work : public node::AsyncResource {
       // report it as a fatal exception. (There is no JavaScript on the
       // callstack that can possibly handle it.)
       if (!env->last_exception.IsEmpty()) {
-        v8::TryCatch try_catch(env->isolate);
-        env->isolate->ThrowException(
-          v8::Local<v8::Value>::New(env->isolate, env->last_exception));
-        node::FatalException(env->isolate, try_catch);
+        v8::Local<v8::Value> err = v8::Local<v8::Value>::New(
+          env->isolate, env->last_exception);
+        v8::Local<v8::Message> msg = v8::Exception::CreateMessage(
+          env->isolate, err);
+        node::FatalException(env->isolate, err, msg);
       }
     }
   }
diff --git a/src/node_internals.h b/src/node_internals.h
@@ -250,6 +250,11 @@ void GetSockOrPeerName(const v8::FunctionCallbackInfo<v8::Value>& args) {
   args.GetReturnValue().Set(err);
 }
 
+void FatalException(v8::Isolate* isolate,
+                    v8::Local<v8::Value> error,
+                    v8::Local<v8::Message> message);
+
+
 void SignalExit(int signo);
 #ifdef __POSIX__
 void RegisterSignalHandler(int signal,

Original file line number	Diff line number	Diff line change
`@@ -3354,10 +3354,11 @@ class Work : public node::AsyncResource {`
`3354`	`3354`	`// report it as a fatal exception. (There is no JavaScript on the`
`3355`	`3355`	`// callstack that can possibly handle it.)`
`3356`	`3356`	`if (!env->last_exception.IsEmpty()) {`
`3357`		`- v8::TryCatch try_catch(env->isolate);`
`3358`		`- env->isolate->ThrowException(`
`3359`		`- v8::Local<v8::Value>::New(env->isolate, env->last_exception));`
`3360`		`- node::FatalException(env->isolate, try_catch);`
	`3357`	`+ v8::Local<v8::Value> err = v8::Local<v8::Value>::New(`
	`3358`	`+ env->isolate, env->last_exception);`
	`3359`	`+ v8::Local<v8::Message> msg = v8::Exception::CreateMessage(`
	`3360`	`+ env->isolate, err);`
	`3361`	`+ node::FatalException(env->isolate, err, msg);`
`3361`	`3362`	`}`
`3362`	`3363`	`}`
`3363`	`3364`	`}`