runtime/vm/intrinsifier_x64.cc - Issue 10917223: Guard against allocation top overflow in ObjectArray_Allocate intrinsic.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: runtime/vm/intrinsifier_x64.cc

Issue 10917223: Guard against allocation top overflow in ObjectArray_Allocate intrinsic. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: remove debugging changes Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: runtime/vm/intrinsifier_x64.cc

diff --git a/runtime/vm/intrinsifier_x64.cc b/runtime/vm/intrinsifier_x64.cc

index d1957cef22d4514fe9cd54acd864b4dda2b7eb29..baae3fcf7fe0fef118d1674d5a09a515d674863e 100644

--- a/runtime/vm/intrinsifier_x64.cc

+++ b/runtime/vm/intrinsifier_x64.cc

@@ -57,10 +57,13 @@ bool Intrinsifier::ObjectArray_Allocate(Assembler* assembler) {

Isolate* isolate = Isolate::Current();

Heap* heap = isolate->heap();

- // RDI: allocation size.

__ movq(RAX, Immediate(heap->TopAddress()));

__ movq(RAX, Address(RAX, 0));

- __ leaq(RCX, Address(RAX, RDI, TIMES_1, 0));

+ // RDI: allocation size.

+ __ movq(RCX, RAX);

+ __ addq(RCX, RDI);

+ __ j(CARRY, &fall_through);

// Check if the allocation fits into the remaining space.

// RAX: potential new object start.

« no previous file with comments | « runtime/vm/intrinsifier_ia32.cc ('k') | no next file » | no next file with comments »