src: allow fatal exceptions to be enhanced

cjihrig · targos · commit a24ab56dc511 · 2019-07-20T11:05:21.000+02:00
This commit allows fatal exceptions to be enhanced so that exceptions thrown from an unhandledException handler have the stack attached properly. PR-URL: #28562 Fixes: #28550 Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -448,10 +448,11 @@ TryCatchScope::~TryCatchScope() {
     HandleScope scope(env_->isolate());
     Local<v8::Value> exception = Exception();
     Local<v8::Message> message = Message();
+    EnhanceFatalException enhance = CanContinue() ?
+        EnhanceFatalException::kEnhance : EnhanceFatalException::kDontEnhance;
     if (message.IsEmpty())
       message = Exception::CreateMessage(env_->isolate(), exception);
-    ReportFatalException(
-        env_, exception, message, EnhanceFatalException::kDontEnhance);
+    ReportFatalException(env_, exception, message, enhance);
     env_->Exit(7);
   }
 }
diff --git a/test/parallel/test-unhandled-exception-rethrow-error.js b/test/parallel/test-unhandled-exception-rethrow-error.js
@@ -0,0 +1,28 @@
+'use strict';
+require('../common');
+
+if (process.argv[2] === 'child') {
+  process.on('uncaughtException', (err) => {
+    err.rethrow = true;
+    throw err;
+  });
+
+  function throwException() {
+    throw new Error('boom');
+  }
+
+  throwException();
+} else {
+  const assert = require('assert');
+  const { spawnSync } = require('child_process');
+  const result = spawnSync(process.execPath, [__filename, 'child']);
+
+  assert.strictEqual(result.status, 7);
+  assert.strictEqual(result.signal, null);
+  assert.strictEqual(result.stdout.toString().trim(), '');
+  // Verify that the error was thrown and that the stack was preserved.
+  const stderr = result.stderr.toString();
+  assert(/Error: boom/.test(stderr));
+  assert(/at throwException/.test(stderr));
+  assert(/rethrow: true/.test(stderr));
+}

Original file line number	Diff line number	Diff line change
`@@ -448,10 +448,11 @@ TryCatchScope::~TryCatchScope() {`
`448`	`448`	`HandleScope scope(env_->isolate());`
`449`	`449`	`Local<v8::Value> exception = Exception();`
`450`	`450`	`Local<v8::Message> message = Message();`
	`451`	`+ EnhanceFatalException enhance = CanContinue() ?`
	`452`	`+ EnhanceFatalException::kEnhance : EnhanceFatalException::kDontEnhance;`
`451`	`453`	`if (message.IsEmpty())`
`452`	`454`	`message = Exception::CreateMessage(env_->isolate(), exception);`
`453`		`- ReportFatalException(`
`454`		`- env_, exception, message, EnhanceFatalException::kDontEnhance);`
	`455`	`+ ReportFatalException(env_, exception, message, enhance);`
`455`	`456`	`env_->Exit(7);`
`456`	`457`	`}`
`457`	`458`	`}`