# HG changeset patch
# User zgu
# Date 1371248432 25200
# Node ID 3aaa16611c300f1b07f62600b9b25c5eb92b72c4
# Parent  bcb96b2922f2e3804365fdf577bfadb4801d48ac# Parent  dba2306ee2e3c3aeeda7edf579bc11241a8e9325
Merge

diff -r bcb96b2922f2 -r 3aaa16611c30 src/share/vm/services/memBaseline.cpp
--- a/src/share/vm/services/memBaseline.cpp	Fri Jun 14 07:30:10 2013 -0700
+++ b/src/share/vm/services/memBaseline.cpp	Fri Jun 14 15:20:32 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();