summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-09-26 10:26:14 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-09-26 10:26:14 -0300
commit0382ea64b4edd68de91741d22bb511f4e5b18a9d (patch)
tree3e35178e7fe826b56e2b41422d4ff0c0096b02fe
parent3dd436d9f1491b0237b2d333e9ef96275735c705 (diff)
parent5093025eaef489ca77d6202c6750a560c00fca5a (diff)
downloadmullvadvpn-0382ea64b4edd68de91741d22bb511f4e5b18a9d.tar.xz
mullvadvpn-0382ea64b4edd68de91741d22bb511f4e5b18a9d.zip
Merge branch 'fix-tun-config-leak'
-rw-r--r--mullvad-jni/src/vpn_service_tun_provider.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/mullvad-jni/src/vpn_service_tun_provider.rs b/mullvad-jni/src/vpn_service_tun_provider.rs
index 0d3f28b754..7f83661d8a 100644
--- a/mullvad-jni/src/vpn_service_tun_provider.rs
+++ b/mullvad-jni/src/vpn_service_tun_provider.rs
@@ -103,12 +103,13 @@ impl VpnServiceTunProvider {
)
.map_err(|cause| Error::FindMethod("createTun", cause))?;
+ let java_config = env.auto_local(config.clone().into_java(&env));
let result = env
.call_method_unchecked(
self.object.as_obj(),
create_tun_method,
JavaType::Primitive(Primitive::Int),
- &[JValue::Object(config.clone().into_java(&env))],
+ &[JValue::Object(java_config.as_obj())],
)
.map_err(|cause| Error::CallMethod("createTun", cause))?;