diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/jni.cc | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 8a0ad7e..121e884 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2000-03-14 Tom Tromey <tromey@cygnus.com> + + * jni.cc (mangled_name): Fixed assertion. + (JNI_GetCreatedJavaVMs): Don't comment out `buf_len' argument; + turned assert into actual failure. + 2000-03-09 Warren Levy <warrenl@cygnus.com> * java/security/Key.java(serialVersionUID): Set to 0 for now. diff --git a/libjava/jni.cc b/libjava/jni.cc index 1d9aae4..6cf489f 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1606,7 +1606,7 @@ mangled_name (jclass klass, _Jv_Utf8Const *func_name, const unsigned char *sig = (const unsigned char *) signature->data; limit = sig + signature->length; - JvAssert (signature[0] == '('); + JvAssert (sig[0] == '('); ++sig; while (1) { @@ -1958,9 +1958,11 @@ JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args) } jint -JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize /* buf_len */, jsize *n_vms) +JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms) { - JvAssert (buf_len > 0); + if (buf_len <= 0) + return JNI_ERR; + // We only support a single VM. if (the_vm != NULL) { |