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

diff -r 87fa6860b5ae -r 28c69e9cf5e2 hotspot/src/os/bsd/dtrace/libjvm_db.c
--- a/hotspot/src/os/bsd/dtrace/libjvm_db.c	Thu Jul 17 15:45:46 2014 -0400
+++ b/hotspot/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 87fa6860b5ae -r 28c69e9cf5e2 hotspot/src/os/solaris/dtrace/libjvm_db.c
--- a/hotspot/src/os/solaris/dtrace/libjvm_db.c	Thu Jul 17 15:45:46 2014 -0400
+++ b/hotspot/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);