Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1467)

Unified Diff: runtime/vm/assembler_arm.cc

Issue 1096063002: Fix array allocation overflow check on arm/arm64/mips. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 8 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
« no previous file with comments | « runtime/tests/vm/vm.status ('k') | runtime/vm/assembler_arm64.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm.cc
===================================================================
--- runtime/vm/assembler_arm.cc (revision 45353)
+++ runtime/vm/assembler_arm.cc (working copy)
@@ -3387,7 +3387,8 @@
const uword top_address = heap->TopAddress(space);
LoadImmediate(temp_reg, top_address);
ldr(instance_reg, Address(temp_reg));
- AddImmediate(instance_reg, instance_size);
+ // TODO(koda): Protect against unsigned overflow here.
+ AddImmediateSetFlags(instance_reg, instance_reg, instance_size);
// instance_reg: potential next object start.
const uword end_address = heap->EndAddress(space);
@@ -3434,8 +3435,8 @@
Heap::Space space = heap->SpaceForAllocation(cid);
LoadImmediate(temp1, heap->TopAddress(space));
ldr(instance, Address(temp1, 0)); // Potential new object start.
- AddImmediate(end_address, instance, instance_size);
- b(failure, VS);
+ AddImmediateSetFlags(end_address, instance, instance_size);
+ b(failure, CS); // Branch if unsigned overflow.
// Check if the allocation fits into the remaining space.
// instance: potential new object start.
« no previous file with comments | « runtime/tests/vm/vm.status ('k') | runtime/vm/assembler_arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698