yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gthread-jni.c (maybe_rethrow): Explicitly malloc and free buf.

Browse Source 
2004-04-21  Mark Wielaard  <mark@klomp.org>

	* native/jni/gtk-peer/gthread-jni.c (maybe_rethrow): Explicitly
	malloc and free buf.

From-SVN: r80948
This commit is contained in:
Mark Wielaard
2004-04-21 07:19:24 +00:00
committed by Michael Koch
parent 27dd18cf73
commit 60e957d071
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2004-04-21 Mark Wielaard <mark@klomp.org>
* native/jni/gtk-peer/gthread-jni.c (maybe_rethrow): Explicitly
malloc and free buf.
2004-04-21 Dalibor Topic <robilad@kaffe.org>
* javax/naming/AuthenticationException.java,
libjava/jni/gtk-peer/gthread-jni.c
+28 -16
View File
@@ -91,28 +91,40 @@ JavaVM *gdk_vm;
static void maybe_rethrow(JNIEnv *gdk_env, char *message, char *file, int line) {
jthrowable cause;
/* rethrow if an exception happened */
if ((cause = (*gdk_env)->ExceptionOccurred(gdk_env)) != NULL) {
jstring jmessage;
jclass obj_class;
jclass obj_class;
jobject obj;
jmethodID ctor;
int len;
char *buf;
/* allocate local message in Java */
int len = strlen(message) + strlen(file) + 25;
char buf[ len ];
bzero(buf, len);
sprintf(buf, "%s (at %s:%d)", message, file, line);
jmessage = (*gdk_env)->NewStringUTF(gdk_env, buf);
/* rethrow if an exception happened */
if ((cause = (*gdk_env)->ExceptionOccurred(gdk_env)) != NULL)
{
/* allocate local message in Java */
len = strlen(message) + strlen(file) + 25;
buf = (char *) malloc(len);
if (buf != NULL)
{
bzero(buf, len);
sprintf(buf, "%s (at %s:%d)", message, file, line);
jmessage = (*gdk_env)->NewStringUTF(gdk_env, buf);
free(buf);
}
else
jmessage = NULL;
/* create RuntimeException wrapper object */
obj_class = (*gdk_env)->FindClass (gdk_env, "java/lang/RuntimeException");
ctor = (*gdk_env)->GetMethodID(gdk_env, obj_class, "<init>", "(Ljava/langString;Ljava/lang/Throwable)V");
obj = (*gdk_env)->NewObject (gdk_env, obj_class, ctor, jmessage, cause);
/* create RuntimeException wrapper object */
obj_class = (*gdk_env)->FindClass (gdk_env,
"java/lang/RuntimeException");
ctor = (*gdk_env)->GetMethodID(gdk_env, obj_class, "<init>",
"(Ljava/langString;Ljava/lang/Throwable)V");
obj = (*gdk_env)->NewObject (gdk_env, obj_class, ctor, jmessage, cause);
/* throw it */
(*gdk_env)->Throw(gdk_env, (jthrowable)obj);
}
/* throw it */
(*gdk_env)->Throw(gdk_env, (jthrowable)obj);
}
}
/* This macro is used to include a source location in the exception message */