android: Properly handle exceptions when loading keys/certificates

diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/jni/libandroidbridge/charonservice.c
index 920453901a5cd14215b4ff945aa54c8be9780d57..1a924303722d1172c7f9e07b7ddd5d8f06eee89c 100644 (file)
--- a/src/frontends/android/jni/libandroidbridge/charonservice.c
+++ b/src/frontends/android/jni/libandroidbridge/charonservice.c
@@ -241,7 +241,7 @@ METHOD(charonservice_t, get_trusted_certificates, linked_list_t*,
                goto failed;
        }
        jcerts = (*env)->CallObjectMethod(env, this->vpn_service, method_id, NULL);
-       if (!jcerts)
+       if (!jcerts || androidjni_exception_occurred(env))
        {
                goto failed;
        }
@@ -273,7 +273,7 @@ METHOD(charonservice_t, get_user_certificate, linked_list_t*,
                goto failed;
        }
        jencodings = (*env)->CallObjectMethod(env, this->vpn_service, method_id);
-       if (!jencodings)
+       if (!jencodings || androidjni_exception_occurred(env))
        {
                goto failed;
        }
@@ -305,7 +305,7 @@ METHOD(charonservice_t, get_user_key, private_key_t*,
                goto failed;
        }
        jkey = (*env)->CallObjectMethod(env, this->vpn_service, method_id);
-       if (!jkey)
+       if (!jkey || androidjni_exception_occurred(env))
        {
                goto failed;
        }