Fix crash when script throws non-error object

This commit is contained in:
Zaid Abdulla committed 2017-06-05 17:13:52 -07:00
1 parent a735f0d9e7
commit 480ae5efd6
1 file changed
+12 -5
+12 -5
View File
@@ -243,18 +243,25 @@ function errorToFault(err) {
if (!err) if (!err)
return null; return null;
// Trim the stack trace at the self-executing anonymous wrapper function if (!err.name)
let stackTrimIndex = err.stack.match(/\s+at\s[^\s]+\s+at\s[^\s]+\s\(vm\.js.+\)/).index; return {code: "script", message: `${err}`};
return { let fault = {
code: `script.${err.name}`, code: `script.${err.name}`,
message: err.message, message: err.message,
detail: { detail: {
name: err.name, name: err.name,
message: err.message, message: err.message
stack: err.stack.slice(0, stackTrimIndex)
} }
};
if (err.stack) {
// Trim the stack trace at the self-executing anonymous wrapper function
let stackTrimIndex = err.stack.match(/\s+at\s[^\s]+\s+at\s[^\s]+\s\(vm\.js.+\)/).index;
fault.detail.stack = err.stack.slice(0, stackTrimIndex);
} }
return fault;
} }