# HG changeset patch
# User zgu
# Date 1371215922 14400
# Node ID ab313d4e9a8be5e94cf20b736f34b4a377b44494
# Parent  a837fa3d3f869b0cd290fc49305f6de5ac794aa9
8011968: Kitchensink crashed with SIGSEGV in MemBaseline::baseline
Summary: Simple fix to add NULL pointer check that can cause segv
Reviewed-by: coleenp, ctornqvi

diff -r a837fa3d3f86 -r ab313d4e9a8b src/share/vm/services/memBaseline.cpp
--- a/src/share/vm/services/memBaseline.cpp	Thu Jun 13 11:16:38 2013 -0700
+++ b/src/share/vm/services/memBaseline.cpp	Fri Jun 14 09:18:42 2013 -0400
@@ -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();