# HG changeset patch
# User never
# Date 1222800961 25200
# Node ID dbec32712472b6dbc0e3d09b0bbb240e38ea0820
# Parent  885fe0f958282a48bdbc97791f74e398fa14d31d
6753795: HotSpot crash in strlen() when JVMTI is used
Summary: test for null instead of strlen
Reviewed-by: rasbold

diff -r 885fe0f95828 -r dbec32712472 src/share/vm/prims/jvmtiEnvBase.cpp
--- a/src/share/vm/prims/jvmtiEnvBase.cpp	Thu Sep 25 12:50:51 2008 -0700
+++ b/src/share/vm/prims/jvmtiEnvBase.cpp	Tue Sep 30 11:56:01 2008 -0700
@@ -121,7 +121,7 @@
   JvmtiEventController::env_initialize((JvmtiEnv*)this);
 
 #ifdef JVMTI_TRACE
-  _jvmti_external.functions = strlen(TraceJVMTI)? &jvmtiTrace_Interface : &jvmti_Interface;
+  _jvmti_external.functions = TraceJVMTI != NULL ? &jvmtiTrace_Interface : &jvmti_Interface;
 #else
   _jvmti_external.functions = &jvmti_Interface;
 #endif