fruity: Fix edge-case in tunnel logic for older OS versions

When usbmuxd is not available, we would try to set up a tunnel connection. This would then fail when the OS is too old for CoreDevice support, and we would erroneously cache the Tunnel implementation in its unopened state. This meant it could be used as if it was opened, causing undefined behavior. Co-authored-by: Håvard Sørbø <[email protected]>
frida · Oct 28, 2024 · 2457ac4 · 2457ac4
1 parent e797e82
commit 2457ac4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/fruity/device-monitor.vala b/src/fruity/device-monitor.vala
@@ -1174,7 +1174,7 @@ namespace Frida.Fruity {
 
 		private Promise<UsbDevice>? device_request;
 		private Promise<LibUSB.Device>? modeswitch_request;
-		private Promise<Tunnel>? tunnel_request;
+		private Promise<Tunnel?>? tunnel_request;
 		private NcmPeer? ncm_peer;
 
 		public PortableCoreDeviceUsbTransport (PortableCoreDeviceBackend parent, LibUSB.Device raw_device, string udid,
@@ -1318,7 +1318,9 @@ namespace Frida.Fruity {
 					try {
 						yield tunnel.open (cancellable);
 					} catch (Error e) {
-						if (!(e is Error.NOT_SUPPORTED))
+						if (e is Error.NOT_SUPPORTED)
+							tunnel = null;
+						else
 							throw e;
 					}
 				}