diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bc11bcf16f2..018b62b262c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2001-05-03 Martin Kahlert + + * jni.cc (_Jv_JNI_GetPrimitiveArrayRegion): Fixed bounds + checking. + (_Jv_JNI_SetPrimitiveArrayRegion): Likewise. + 2001-04-30 Andrew Haley * libgcj.spec.in (jc1): Add EXCEPTIONSPEC. diff --git a/libjava/jni.cc b/libjava/jni.cc index 34f2995a408..3f5703a18e0 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1366,7 +1366,7 @@ _Jv_JNI_GetPrimitiveArrayRegion (JNIEnv *env, JArray *array, { // The cast to unsigned lets us save a comparison. if (start < 0 || len < 0 - || (unsigned long) (start + len) >= (unsigned long) array->length) + || (unsigned long) (start + len) > (unsigned long) array->length) { try { @@ -1393,7 +1393,7 @@ _Jv_JNI_SetPrimitiveArrayRegion (JNIEnv *env, JArray *array, { // The cast to unsigned lets us save a comparison. if (start < 0 || len < 0 - || (unsigned long) (start + len) >= (unsigned long) array->length) + || (unsigned long) (start + len) > (unsigned long) array->length) { try {