Skip to content

Commit 259d449

Browse files
vkurchatkintjfontaine
authored andcommitted
src: only access stack of defined errors
Avoid segmentation fault when `undefined` is thrown
1 parent f9e3364 commit 259d449

3 files changed

Lines changed: 39 additions & 2 deletions

File tree

src/node.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,8 +1176,15 @@ static void ReportException(Handle<Value> er, Handle<Message> message) {
11761176

11771177
DisplayExceptionLine(message);
11781178

1179-
Local<Value> trace_value(
1180-
er->ToObject()->Get(FIXED_ONE_BYTE_STRING(node_isolate, "stack")));
1179+
Local<Value> trace_value;
1180+
1181+
if (er->IsUndefined()) {
1182+
trace_value = Undefined(node_isolate);
1183+
} else {
1184+
trace_value =
1185+
er->ToObject()->Get(FIXED_ONE_BYTE_STRING(node_isolate, "stack"));
1186+
}
1187+
11811188
String::Utf8Value trace(trace_value);
11821189

11831190
// range errors have a trace member set to undefined

test/message/throw_undefined.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
25+
throw undefined;

test/message/throw_undefined.out

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
*test*message*throw_undefined.js:25
3+
throw undefined;
4+
^
5+
undefined

0 commit comments

Comments
 (0)