Mercurial > hg > graal-compiler
changeset 597:59150d6667e1
Merge
author | jmasa |
---|---|
date | Tue, 24 Feb 2009 22:51:00 -0800 |
parents | 83ef1482304c (diff) 3698e8f47799 (current diff) |
children | 1fa16c3565be |
files | |
diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/utilities/growableArray.cpp Tue Feb 24 15:50:23 2009 -0500 +++ b/src/share/vm/utilities/growableArray.cpp Tue Feb 24 22:51:00 2009 -0800 @@ -43,11 +43,13 @@ #endif void* GenericGrowableArray::raw_allocate(int elementSize) { + assert(_max >= 0, "integer overflow"); + size_t byte_size = elementSize * (size_t) _max; if (on_stack()) { - return (void*)resource_allocate_bytes(elementSize * _max); + return (void*)resource_allocate_bytes(byte_size); } else if (on_C_heap()) { - return (void*)AllocateHeap(elementSize * _max, "GrET in " __FILE__); + return (void*)AllocateHeap(byte_size, "GrET in " __FILE__); } else { - return _arena->Amalloc(elementSize * _max); + return _arena->Amalloc(byte_size); } }