Mercurial > hg > openjdk > jdk7u > hotspot
changeset 5016:ee18e60e7e8d hs24.80-b06
8022836: JVM crashes in JVMTIENVBASE::GET_CURRENT_CONTENDED_MONITOR and GET_OWNED_MONITOR
Summary: Check that the _java_thread parameter is valid when it is possible that the JavaThread has exited after the initial checks were made in generated/jvmtifiles/jvmtiEnter.cpp: jvmti_GetCurrentContendedMonitor()
Reviewed-by: dcubed, dsamersoff
author | sgabdura |
---|---|
date | Fri, 04 Apr 2014 10:15:08 +0200 |
parents | 7801eaea32d2 |
children | c0f53284e788 |
files | src/share/vm/prims/jvmtiEnvBase.hpp |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiEnvBase.hpp Thu Apr 03 07:33:45 2014 +0200 +++ b/src/share/vm/prims/jvmtiEnvBase.hpp Fri Apr 04 10:15:08 2014 +0200 @@ -400,7 +400,11 @@ VMOp_Type type() const { return VMOp_GetCurrentContendedMonitor; } jvmtiError result() { return _result; } void doit() { - _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr); + _result = JVMTI_ERROR_THREAD_NOT_ALIVE; + if (Threads::includes(_java_thread) && !_java_thread->is_exiting() && + _java_thread->threadObj() != NULL) { + _result = ((JvmtiEnvBase *)_env)->get_current_contended_monitor(_calling_thread,_java_thread,_owned_monitor_ptr); + } } };