From 565c5569f449bea34a5619205c7ec0236d0f9995 Mon Sep 17 00:00:00 2001
From: Marcel Laverdet <marcel@laverdet.com>
Date: Thu, 18 May 2017 16:53:20 -0500
Subject: [PATCH] vm: fix displayErrors in runIn.. functions

This option has been broken for almost a year when used with any of the
vm.runIn.. family of functions, except for syntax errors.

Backport-PR-URL: https://github.com/nodejs/node/pull/14373
PR-URL: https://github.com/nodejs/node/pull/13074
Reviewed-By: Anna Henningsen <anna@addaleax.net>
---
 lib/repl.js                               |  2 +-
 src/node_contextify.cc                    | 18 +++++++-----------
 test/message/vm_display_runtime_error.js  |  8 +++++++-
 test/message/vm_display_runtime_error.out | 15 +++++++++++++++
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/lib/repl.js b/lib/repl.js
index 2dfcc2899344a6..9f544759a6581f 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -332,7 +332,7 @@ function REPLServer(prompt,
       try {
         try {
           const scriptOptions = {
-            displayErrors: true,
+            displayErrors: false,
             breakOnSigint: self.breakEvalOnSigint
           };
 
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
index 1ec8774f240e17..e1f00ad07f64bc 100644
--- a/src/node_contextify.cc
+++ b/src/node_contextify.cc
@@ -684,8 +684,10 @@ class ContextifyScript : public BaseObject {
       return;
     }
 
-    Local<String> decorated_stack = String::Concat(arrow.As<String>(),
-                                                   stack.As<String>());
+    Local<String> decorated_stack = String::Concat(
+        String::Concat(arrow.As<String>(),
+          FIXED_ONE_BYTE_STRING(env->isolate(), "\n")),
+        stack.As<String>());
     err_obj->Set(env->stack_string(), decorated_stack);
     err_obj->SetPrivate(
         env->context(),
@@ -932,6 +934,9 @@ class ContextifyScript : public BaseObject {
         env->ThrowError("Script execution timed out.");
       } else if (received_signal) {
         env->ThrowError("Script execution interrupted.");
+      } else if (display_errors) {
+        // We should decorate non-termination exceptions
+        DecorateErrorStack(env, *try_catch);
       }
 
       // If there was an exception thrown during script execution, re-throw it.
@@ -944,15 +949,6 @@ class ContextifyScript : public BaseObject {
       return false;
     }
 
-    if (result.IsEmpty()) {
-      // Error occurred during execution of the script.
-      if (display_errors) {
-        DecorateErrorStack(env, *try_catch);
-      }
-      try_catch->ReThrow();
-      return false;
-    }
-
     args.GetReturnValue().Set(result);
     return true;
   }
diff --git a/test/message/vm_display_runtime_error.js b/test/message/vm_display_runtime_error.js
index 861e87f2f2bb93..a16afaee3d559b 100644
--- a/test/message/vm_display_runtime_error.js
+++ b/test/message/vm_display_runtime_error.js
@@ -4,6 +4,12 @@ const vm = require('vm');
 
 console.error('beginning');
 
-vm.runInThisContext('throw new Error("boo!")', { filename: 'test.vm' });
+try {
+  vm.runInThisContext('throw new Error("boo!")', { filename: 'test.vm'});
+} catch (err) {
+  console.error(err.stack);
+}
+
+vm.runInThisContext('throw new Error("spooky!")', { filename: 'test.vm' });
 
 console.error('end');
diff --git a/test/message/vm_display_runtime_error.out b/test/message/vm_display_runtime_error.out
index d5cf1d3ee50dbb..789f12733c163f 100644
--- a/test/message/vm_display_runtime_error.out
+++ b/test/message/vm_display_runtime_error.out
@@ -14,3 +14,18 @@ Error: boo!
     at tryModuleLoad (module.js:*:*)
     at Function.Module._load (module.js:*)
     at Module.runMain (module.js:*)
+test.vm:1
+throw new Error("spooky!")
+^
+
+Error: spooky!
+    at test.vm:1:7
+    at ContextifyScript.Script.runInThisContext (vm.js:*)
+    at Object.runInThisContext (vm.js:*)
+    at Object.<anonymous> (*test*message*vm_display_runtime_error.js:*)
+    at Module._compile (module.js:*)
+    at Object.Module._extensions..js (module.js:*)
+    at Module.load (module.js:*)
+    at tryModuleLoad (module.js:*:*)
+    at Function.Module._load (module.js:*)
+    at Module.runMain (module.js:*)