Skip to content

Commit 7bd2476

Browse files
committed
Version 5.1.281.65 (cherry-pick)
Merged 85b8c2d Fix observable array access when formatting stack trace. BUG=chromium:617527 LOG=N [email protected] Review URL: https://codereview.chromium.org/2051383002 . Cr-Commit-Position: refs/branch-heads/5.1@{#76} Cr-Branched-From: 167dc63-refs/heads/5.1.281@{#1} Cr-Branched-From: 03953f5-refs/heads/master@{#35282}
1 parent 4bf0f33 commit 7bd2476

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

include/v8-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define V8_MAJOR_VERSION 5
1212
#define V8_MINOR_VERSION 1
1313
#define V8_BUILD_NUMBER 281
14-
#define V8_PATCH_LEVEL 64
14+
#define V8_PATCH_LEVEL 65
1515

1616
// Use 1 for candidates and 0 otherwise.
1717
// (Boolean macro values are not supported by all preprocessors.)

src/js/messages.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -795,13 +795,15 @@ function FormatErrorString(error) {
795795

796796

797797
function GetStackFrames(raw_stack) {
798+
var internal_raw_stack = new InternalArray();
799+
%MoveArrayContents(raw_stack, internal_raw_stack);
798800
var frames = new InternalArray();
799-
var sloppy_frames = raw_stack[0];
800-
for (var i = 1; i < raw_stack.length; i += 4) {
801-
var recv = raw_stack[i];
802-
var fun = raw_stack[i + 1];
803-
var code = raw_stack[i + 2];
804-
var pc = raw_stack[i + 3];
801+
var sloppy_frames = internal_raw_stack[0];
802+
for (var i = 1; i < internal_raw_stack.length; i += 4) {
803+
var recv = internal_raw_stack[i];
804+
var fun = internal_raw_stack[i + 1];
805+
var code = internal_raw_stack[i + 2];
806+
var pc = internal_raw_stack[i + 3];
805807
var pos = %_IsSmi(code) ? code : %FunctionGetPositionForOffset(code, pc);
806808
sloppy_frames--;
807809
frames.push(new CallSite(recv, fun, pos, (sloppy_frames < 0)));

0 commit comments

Comments
 (0)