Mercurial > hg > truffle
comparison src/share/vm/prims/jni.cpp @ 11059:97c5acae48be
7007040: Check of capacity paramenters in JNI_PushLocalFrame is wrong
Summary: changed AND to OR
Reviewed-by: coleenp, hseigel
Contributed-by: lois.foltan@oracle.com
author | hseigel |
---|---|
date | Sun, 30 Jun 2013 09:59:08 -0400 |
parents | f2110083203d |
children | f323bbb0e6c1 |
comparison
equal
deleted
inserted
replaced
11058:bb4f2b27e824 | 11059:97c5acae48be |
---|---|
877 #else /* USDT2 */ | 877 #else /* USDT2 */ |
878 HOTSPOT_JNI_PUSHLOCALFRAME_ENTRY( | 878 HOTSPOT_JNI_PUSHLOCALFRAME_ENTRY( |
879 env, capacity); | 879 env, capacity); |
880 #endif /* USDT2 */ | 880 #endif /* USDT2 */ |
881 //%note jni_11 | 881 //%note jni_11 |
882 if (capacity < 0 && capacity > MAX_REASONABLE_LOCAL_CAPACITY) { | 882 if (capacity < 0 || capacity > MAX_REASONABLE_LOCAL_CAPACITY) { |
883 #ifndef USDT2 | 883 #ifndef USDT2 |
884 DTRACE_PROBE1(hotspot_jni, PushLocalFrame__return, JNI_ERR); | 884 DTRACE_PROBE1(hotspot_jni, PushLocalFrame__return, JNI_ERR); |
885 #else /* USDT2 */ | 885 #else /* USDT2 */ |
886 HOTSPOT_JNI_PUSHLOCALFRAME_RETURN( | 886 HOTSPOT_JNI_PUSHLOCALFRAME_RETURN( |
887 (uint32_t)JNI_ERR); | 887 (uint32_t)JNI_ERR); |