From d20f9b3e84f26e099e30a6c4ae814925ad3d4ebb Mon Sep 17 00:00:00 2001
From: ohair <none@none>
Date: Wed, 8 Jul 2009 09:12:17 -0700
Subject: 6855551: java -Xrunhprof crashes when running with classes compiled
 with targed=7 Reviewed-by: tbell, dcubed

---
 src/share/demo/jvmti/java_crw_demo/java_crw_demo.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/share/demo/jvmti/java_crw_demo')

diff --git a/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c b/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
index 6d43d9baa9..d241e80daf 100644
--- a/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
+++ b/src/share/demo/jvmti/java_crw_demo/java_crw_demo.c
@@ -263,8 +263,8 @@ assert_error(CrwClassImage *ci, const char *condition,
     (void)sprintf(buf,
                 "CRW ASSERTION FAILURE: %s (%s:%s:%d)",
                 condition,
-                ci->name==0?"?":ci->name,
-                mi->name==0?"?":mi->name,
+                ci->name==NULL?"?":ci->name,
+                (mi==NULL||mi->name==NULL)?"?":mi->name,
                 byte_code_offset);
     fatal_error(ci, buf, file, line);
 }
-- 
cgit v1.2.3