diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-16 12:07:35 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-16 12:07:35 -0300 |
| commit | 78f85cb38e4fd325892b56298bde299dd357061d (patch) | |
| tree | 802b6bc858dfd7653753a240915b6129d0913369 | |
| parent | 01e297be0e52f0eade0dde3119dec0597f7646ad (diff) | |
| parent | 71706d279e244912c1d808a262873783090bcf59 (diff) | |
| download | mullvadvpn-78f85cb38e4fd325892b56298bde299dd357061d.tar.xz mullvadvpn-78f85cb38e4fd325892b56298bde299dd357061d.zip | |
Merge branch 'fix-local-reference-leaks'
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 2354ce0656..bbaee67a8c 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -133,7 +133,7 @@ fn ipvx_addr_into_java<'env>(original_octets: &[u8], env: &JNIEnv<'env>) -> JObj let octets = env.auto_local(JObject::from(octets_array)); let result = env .call_static_method_unchecked( - "java/net/InetAddress", + class.as_obj(), constructor, JavaType::Object("java/net/InetAddress".to_owned()), &[JValue::Object(octets.as_obj())], @@ -680,7 +680,8 @@ impl<'env> IntoJava<'env> for BlockReason { BlockReason::TunnelParameterError(reason) => { let class = get_class("net/mullvad/mullvadvpn/model/BlockReason$ParameterGeneration"); - let parameters = [JValue::Object(reason.into_java(env))]; + let reason = env.auto_local(JObject::from(reason.into_java(env))); + let parameters = [JValue::Object(reason.as_obj())]; return env .new_object( &class, |