From: Andrej Mihajlov <and@mullvad.net>
Date: Fri, 19 Jun 2020 10:42:35 +0000 (+0200)
Subject: Fix retain cycle between NWPathMonitor and PacketTunnelProvider
X-Git-Tag: 1.0.10-18~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9bd6e576f89016fbb4ff0a7944a4f3cd8ca863d;p=thirdparty%2Fwireguard-apple.git

Fix retain cycle between NWPathMonitor and PacketTunnelProvider

See: https://www.marisibrothers.com/2017/04/memory-leak-in-swift-assigning-function.html

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
index 2f7062f..987c290 100644
--- a/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
+++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelProvider.swift
@@ -52,7 +52,9 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
                 startTunnelCompletionHandler(PacketTunnelProviderError.couldNotSetNetworkSettings)
             } else {
                 self.networkMonitor = NWPathMonitor()
-                self.networkMonitor!.pathUpdateHandler = self.pathUpdate
+                self.networkMonitor!.pathUpdateHandler = { [weak self] path in
+                    self?.pathUpdate(path: path)
+                }
                 self.networkMonitor!.start(queue: DispatchQueue(label: "NetworkMonitor"))
 
                 let fileDescriptor = (self.packetFlow.value(forKeyPath: "socket.fileDescriptor") as? Int32) ?? -1