From 55cc31c086c098bf18b7ae7417ba38dea171714c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 27 Apr 2001 16:09:54 +0000 Subject: [PATCH] jni.cc (_Jv_JNI_GetPrimitiveArrayRegion): Fixed bounds checking. * jni.cc (_Jv_JNI_GetPrimitiveArrayRegion): Fixed bounds checking. (_Jv_JNI_SetPrimitiveArrayRegion): Likewise. From-SVN: r41634 --- libjava/ChangeLog | 8 +++++++- libjava/jni.cc | 14 ++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3321bcb2cc3..74523a6722c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,10 +1,16 @@ +2001-04-27 Tom Tromey + + * jni.cc (_Jv_JNI_GetPrimitiveArrayRegion): Fixed bounds + checking. + (_Jv_JNI_SetPrimitiveArrayRegion): Likewise. + 2001-04-27 Martin Kahlert * include/jni.h (struct JNINativeInterface): Fixed types in Get/Set*ArrayRegion declarations. (class _Jv_JNIEnv): Likewise. -2001-04-25 Bryce McKinlay +2001-04-26 Alexandre Oliva * configure.in: Obtain THREADS with `gcc -v'. * configure: Rebuilt. diff --git a/libjava/jni.cc b/libjava/jni.cc index 6190f4f8d74..34f2995a408 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1364,7 +1364,9 @@ _Jv_JNI_GetPrimitiveArrayRegion (JNIEnv *env, JArray *array, jsize start, jsize len, T *buf) { - if (start < 0 || len >= array->length || start + len >= array->length) + // The cast to unsigned lets us save a comparison. + if (start < 0 || len < 0 + || (unsigned long) (start + len) >= (unsigned long) array->length) { try { @@ -1389,7 +1391,9 @@ static void _Jv_JNI_SetPrimitiveArrayRegion (JNIEnv *env, JArray *array, jsize start, jsize len, T *buf) { - if (start < 0 || len >= array->length || start + len >= array->length) + // The cast to unsigned lets us save a comparison. + if (start < 0 || len < 0 + || (unsigned long) (start + len) >= (unsigned long) array->length) { try { @@ -1432,7 +1436,8 @@ _Jv_JNI_MonitorEnter (JNIEnv *env, jobject obj) { try { - return _Jv_MonitorEnter (obj); + _Jv_MonitorEnter (obj); + return 0; } catch (jthrowable t) { @@ -1446,7 +1451,8 @@ _Jv_JNI_MonitorExit (JNIEnv *env, jobject obj) { try { - return _Jv_MonitorExit (obj); + _Jv_MonitorExit (obj); + return 0; } catch (jthrowable t) { -- 2.43.5