Merge
authorzgu
Fri, 14 Jun 2013 15:20:32 -0700
changeset 18077 efc3787b84a0
parent 18074 df905a921b94 (current diff)
parent 18076 15f972729e16 (diff)
child 18080 fc13007c0363
Merge
--- a/hotspot/src/share/vm/services/memBaseline.cpp	Fri Jun 14 07:30:10 2013 -0700
+++ b/hotspot/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();