diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-18 17:56:33 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-18 17:56:33 +0000 |
| commit | 7a59a77ef33c5c3f96f1aeb8f6f1c9e323311b46 (patch) | |
| tree | 5563e6839de77f226986a446f01a44992d6c0531 /libjava | |
| parent | 6b784824a31eeebd53f7594401f03efbc51bc657 (diff) | |
| download | ppe42-gcc-7a59a77ef33c5c3f96f1aeb8f6f1c9e323311b46.tar.gz ppe42-gcc-7a59a77ef33c5c3f96f1aeb8f6f1c9e323311b46.zip | |
* jni.cc (_Jv_JNI_GetStringUTFChars): Fail gracefully if string
is null.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73707 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/jni.cc | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3dcb93016e4..68b32b125bc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-11-18 Tom Tromey <tromey@redhat.com> + + * jni.cc (_Jv_JNI_GetStringUTFChars): Fail gracefully if string + is null. + 2003-11-17 Graydon Hoare <graydon@redhat.com> * javax/swing/plaf/basic/BasicDefaults.java: Rewrite to spec. diff --git a/libjava/jni.cc b/libjava/jni.cc index d311f60ff1c..007aabc4008 100644 --- a/libjava/jni.cc +++ b/libjava/jni.cc @@ -1298,10 +1298,12 @@ static const char * (JNICALL _Jv_JNI_GetStringUTFChars) (JNIEnv *env, jstring string, jboolean *isCopy) { - string = unwrap (string); - jsize len = JvGetStringUTFLength (string); try { + string = unwrap (string); + if (string == NULL) + return NULL; + jsize len = JvGetStringUTFLength (string); char *r = (char *) _Jv_Malloc (len + 1); JvGetStringUTFRegion (string, 0, string->length(), r); r[len] = '\0'; |
