Mercurial > hg > truffle
changeset 10976:dba2306ee2e3
Merge
author | zgu |
---|---|
date | Fri, 14 Jun 2013 07:39:19 -0700 |
parents | ab313d4e9a8b (diff) a0a47b2649a2 (current diff) |
children | 3aaa16611c30 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/services/memBaseline.cpp Fri Jun 14 13:11:58 2013 +0200 +++ b/src/share/vm/services/memBaseline.cpp Fri Jun 14 07:39:19 2013 -0700 @@ -130,7 +130,7 @@ if (malloc_ptr->is_arena_record()) { // see if arena memory record present MemPointerRecord* next_malloc_ptr = (MemPointerRecordEx*)malloc_itr.peek_next(); - if (next_malloc_ptr->is_arena_memory_record()) { + if (next_malloc_ptr != NULL && next_malloc_ptr->is_arena_memory_record()) { assert(next_malloc_ptr->is_memory_record_of_arena(malloc_ptr), "Arena records do not match"); size = next_malloc_ptr->size();