# HG changeset patch
# User kevinw
# Date 1405935650 -3600
# Node ID fd94cbe7c5da699e946895f23d72dc909f9d7028
# Parent  b69c268f95b7aa73890af13ada2d11060b2c36d9
8049684: pstack crashes on java core dump
Reviewed-by: sundar, sspitsyn

diff -r b69c268f95b7 -r fd94cbe7c5da src/os/bsd/dtrace/libjvm_db.c
--- a/src/os/bsd/dtrace/libjvm_db.c	Fri Jul 25 10:42:05 2014 -0700
+++ b/src/os/bsd/dtrace/libjvm_db.c	Mon Jul 21 10:40:50 2014 +0100
@@ -260,6 +260,9 @@
   uint64_t base;
   int err;
 
+  /* Clear *vmp now in case we jump to fail: */
+  memset(vmp, 0, sizeof(VMStructEntry));
+
   err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
   CHECK_FAIL(err);
   err = read_pointer(J, sym_addr, &gHotSpotVMStructs);
diff -r b69c268f95b7 -r fd94cbe7c5da src/os/solaris/dtrace/libjvm_db.c
--- a/src/os/solaris/dtrace/libjvm_db.c	Fri Jul 25 10:42:05 2014 -0700
+++ b/src/os/solaris/dtrace/libjvm_db.c	Mon Jul 21 10:40:50 2014 +0100
@@ -260,6 +260,9 @@
   uint64_t base;
   int err;
 
+  /* Clear *vmp now in case we jump to fail: */
+  memset(vmp, 0, sizeof(VMStructEntry));
+
   err = ps_pglobal_lookup(J->P, LIBJVM_SO, "gHotSpotVMStructs", &sym_addr);
   CHECK_FAIL(err);
   err = read_pointer(J, sym_addr, &gHotSpotVMStructs);