ANDROID: JNI error checking and free local references

0-8-15 · 0-8-15 · commit f1bd02950355 · 2020-12-02T13:02:59.000+01:00
diff --git a/loaders/android/bootstrap.c.in b/loaders/android/bootstrap.c.in
@@ -135,7 +135,12 @@ void android_launch_url(char* urlstring){
     jstring jurlstring = (*env)->NewStringUTF(env, urlstring);
     jclass cls = (*env)->FindClass(env, "@SYS_PACKAGE_SLASH@/@SYS_APPNAME@");
     jmethodID method = cls ? (*env)->GetMethodID(env, cls, "openURL", "(Ljava/lang/String;)V") : NULL;
-    if(method) (*env)->CallVoidMethod(env, globalObj, method, jurlstring);
+    if(method) {
+      (*env)->CallVoidMethod(env, globalObj, method, jurlstring);
+      (*env)->DeleteLocalRef(env, method);
+    }
+    if(jurlstring) (*env)->DeleteLocalRef(env, jurlstring);
+    if(cls) (*env)->DeleteLocalRef(env, cls);
     JNI_forward_exception_to_gambit(env);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,12 @@ void android_launch_url(char* urlstring){`
`135`	`135`	`jstring jurlstring = (*env)->NewStringUTF(env, urlstring);`
`136`	`136`	`jclass cls = (*env)->FindClass(env, "@SYS_PACKAGE_SLASH@/@SYS_APPNAME@");`
`137`	`137`	`jmethodID method = cls ? (*env)->GetMethodID(env, cls, "openURL", "(Ljava/lang/String;)V") : NULL;`
`138`		`- if(method) (*env)->CallVoidMethod(env, globalObj, method, jurlstring);`
	`138`	`+ if(method) {`
	`139`	`+ (*env)->CallVoidMethod(env, globalObj, method, jurlstring);`
	`140`	`+ (*env)->DeleteLocalRef(env, method);`
	`141`	`+ }`
	`142`	`+ if(jurlstring) (*env)->DeleteLocalRef(env, jurlstring);`
	`143`	`+ if(cls) (*env)->DeleteLocalRef(env, cls);`
`139`	`144`	`JNI_forward_exception_to_gambit(env);`
`140`	`145`	`}`
`141`	`146`	`}`