Fix some crash bugs in the browser plugin code by using

the correct functions to call static Java methods.

Submitted by:	Richard Tobin <richard@cogsci.ed.ac.uk>
Reviewed by:	sobomax
Approved by:	sobomax

4 files changed, 124 insertions, 0 deletions

diff --git a/java/jdk13/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c b/java/jdk13/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
new file mode 100644
index 000000000000..9717547cbe12
--- /dev/null
+++ b/java/jdk13/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
++++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
+@@ -590,7 +590,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
+ 			"(Ljava/lang/Object;[BII)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
+ }
+ 
+ /*
+@@ -605,7 +605,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
+ 			"(Ljava/lang/Object;)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
+ }
+ 
+ /*
+@@ -623,7 +623,7 @@
+ 			"(Ljava/lang/Object;)V");
+     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
+ 
+-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
++    (*env)->CallStaticVoidMethod(env, clz, meth, is);
+ 
+     /* 
+        It is extremely important to unset the nativeConnection field in 
diff --git a/java/jdk14/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c b/java/jdk14/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
new file mode 100644
index 000000000000..9717547cbe12
--- /dev/null
+++ b/java/jdk14/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
++++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
+@@ -590,7 +590,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
+ 			"(Ljava/lang/Object;[BII)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
+ }
+ 
+ /*
+@@ -605,7 +605,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
+ 			"(Ljava/lang/Object;)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
+ }
+ 
+ /*
+@@ -623,7 +623,7 @@
+ 			"(Ljava/lang/Object;)V");
+     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
+ 
+-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
++    (*env)->CallStaticVoidMethod(env, clz, meth, is);
+ 
+     /* 
+        It is extremely important to unset the nativeConnection field in 
diff --git a/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
new file mode 100644
index 000000000000..9717547cbe12
--- /dev/null
+++ b/java/jdk15/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
++++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
+@@ -590,7 +590,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
+ 			"(Ljava/lang/Object;[BII)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
+ }
+ 
+ /*
+@@ -605,7 +605,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
+ 			"(Ljava/lang/Object;)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
+ }
+ 
+ /*
+@@ -623,7 +623,7 @@
+ 			"(Ljava/lang/Object;)V");
+     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
+ 
+-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
++    (*env)->CallStaticVoidMethod(env, clz, meth, is);
+ 
+     /* 
+        It is extremely important to unset the nativeConnection field in 
diff --git a/java/jdk16/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c b/java/jdk16/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
new file mode 100644
index 000000000000..9717547cbe12
--- /dev/null
+++ b/java/jdk16/files/patch-..::ext::plugin::oji-plugin::src::motif::jvm_natives::native.c
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+--- ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	22 Jan 2002 19:56:49 -0000	1.5
++++ ../ext/plugin/oji-plugin/src/motif/jvm_natives/native.c	13 Apr 2002 05:11:05 -0000
+@@ -590,7 +590,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "readHttpsURL",
+ 			"(Ljava/lang/Object;[BII)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this, buf, offset, len);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this, buf, offset, len);
+ }
+ 
+ /*
+@@ -605,7 +605,7 @@
+     jclass clz = (*env)->FindClass(env, "sun/plugin/navig/motif/Worker");
+     jmethodID meth = (*env)->GetStaticMethodID(env, clz, "bytesAvailable",
+ 			"(Ljava/lang/Object;)I");
+-    return (jint)(*env)->CallStaticObjectMethod(env, clz, meth, this);
++    return (jint)(*env)->CallStaticIntMethod(env, clz, meth, this);
+ }
+ 
+ /*
+@@ -623,7 +623,7 @@
+ 			"(Ljava/lang/Object;)V");
+     jfieldID nativeConnID = (*env)->GetFieldID(env, isClass, "nativeConnection", "J");
+ 
+-    (*env)->CallStaticObjectMethod(env, clz, meth, is);
++    (*env)->CallStaticVoidMethod(env, clz, meth, is);
+ 
+     /* 
+        It is extremely important to unset the nativeConnection field in