contextify: throw timeout error properly

indutny · indutny · commit c047127410b9 · 2014-06-12T18:30:41.000-07:00
fix nodejs#7509
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -655,6 +655,7 @@ class ContextifyScript : public BaseObject {
     if (try_catch.HasCaught() && try_catch.HasTerminated()) {
       V8::CancelTerminateExecution(env->isolate());
       env->ThrowError("Script execution timed out.");
+      try_catch.ReThrow();
       return false;
     }
 
diff --git a/test/simple/test-vm-timeout-rethrow.js b/test/simple/test-vm-timeout-rethrow.js
@@ -0,0 +1,48 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var assert = require('assert');
+var vm = require('vm');
+var spawn = require('child_process').spawn;
+
+if (process.argv[2] === 'child') {
+  var code = 'var j = 0;\n' +
+      'for (var i = 0; i < 1000000; i++) j += add(i, i + 1);\n'
+      'j;';
+
+  var ctx = vm.createContext({
+    add: function(x, y) {
+      return x + y;
+    }
+  });
+
+  vm.runInContext(code, ctx, { timeout: 1 });
+} else {
+  var proc = spawn(process.execPath, process.argv.slice(1).concat('child'));
+  var err = '';
+  proc.stderr.on('data', function(data) {
+    err += data;
+  });
+
+  process.on('exit', function() {
+    assert.ok(/Script execution timed out/.test(err));
+  });
+}

Original file line number	Diff line number	Diff line change
`@@ -655,6 +655,7 @@ class ContextifyScript : public BaseObject {`
`655`	`655`	`if (try_catch.HasCaught() && try_catch.HasTerminated()) {`
`656`	`656`	`V8::CancelTerminateExecution(env->isolate());`
`657`	`657`	`env->ThrowError("Script execution timed out.");`
	`658`	`+ try_catch.ReThrow();`
`658`	`659`	`return false;`
`659`	`660`	`}`
`660`	`661`