From 9a5e291348c14ff28f910e6c759134d7a5fd1992 Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Sat, 29 Mar 2025 10:55:40 -0600 Subject: [PATCH 1/4] Don't free core device proxy client after adapter takes ownership --- StikJIT/idevice/jit.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/StikJIT/idevice/jit.c b/StikJIT/idevice/jit.c index c47f851..6fe9f9e 100644 --- a/StikJIT/idevice/jit.c +++ b/StikJIT/idevice/jit.c @@ -60,7 +60,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l if (err != IdeviceSuccess) { logger("Failed to connect to RSD port: %d", err); adapter_free(adapter); - core_device_proxy_free(core_device); return 1; } logger("Successfully connected to RSD port"); @@ -75,7 +74,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l if (err != IdeviceSuccess) { logger("Failed to create XPC device: %d", err); adapter_free(adapter); - core_device_proxy_free(core_device); return 1; } @@ -93,7 +91,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l if (err != IdeviceSuccess) { logger("Failed to get process control service: %d", err); xpc_device_free(xpc_device); - core_device_proxy_free(core_device); return 1; } @@ -108,7 +105,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l if (err != IdeviceSuccess) { logger("Failed to extract adapter: %d", err); xpc_device_free(xpc_device); - core_device_proxy_free(core_device); return 1; } @@ -118,7 +114,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l logger("Failed to connect to process control port: %d", err); adapter_free(pc_adapter); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } logger("Successfully connected to process control port"); @@ -130,7 +125,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l logger("Failed to create remote server: %d", err); adapter_free(pc_adapter); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } @@ -141,7 +135,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l logger("Failed to create process control client: %d", err); remote_server_free(remote_server); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } @@ -154,7 +147,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l process_control_free(process_control); remote_server_free(remote_server); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } logger("Successfully launched app with PID: %" PRIu64 "", pid); @@ -173,7 +165,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l process_control_free(process_control); remote_server_free(remote_server); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } @@ -186,7 +177,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l process_control_free(process_control); remote_server_free(remote_server); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } logger("Successfully connected to debug proxy port"); @@ -201,7 +191,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l process_control_free(process_control); remote_server_free(remote_server); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } @@ -218,7 +207,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l process_control_free(process_control); remote_server_free(remote_server); xpc_service_free(pc_service); - core_device_proxy_free(core_device); return 1; } From 05153ae583ad8eb233510d5908f5a5336aee23d7 Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Sat, 29 Mar 2025 10:58:36 -0600 Subject: [PATCH 2/4] Free debug service in error cases Prevents memory leaks --- StikJIT/idevice/jit.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/StikJIT/idevice/jit.c b/StikJIT/idevice/jit.c index 6fe9f9e..8ca2552 100644 --- a/StikJIT/idevice/jit.c +++ b/StikJIT/idevice/jit.c @@ -82,6 +82,7 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l err = xpc_device_get_service(xpc_device, "com.apple.internal.dt.remote.debugproxy", &debug_service); if (err != IdeviceSuccess) { logger("Failed to get debug proxy service: %d", err); + xpc_device_free(xpc_device); return 1; } @@ -114,6 +115,7 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l logger("Failed to connect to process control port: %d", err); adapter_free(pc_adapter); xpc_service_free(pc_service); + xpc_service_free(debug_service); return 1; } logger("Successfully connected to process control port"); @@ -125,6 +127,7 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l logger("Failed to create remote server: %d", err); adapter_free(pc_adapter); xpc_service_free(pc_service); + xpc_service_free(debug_service); return 1; } @@ -135,6 +138,7 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l logger("Failed to create process control client: %d", err); remote_server_free(remote_server); xpc_service_free(pc_service); + xpc_service_free(debug_service); return 1; } @@ -147,6 +151,7 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l process_control_free(process_control); remote_server_free(remote_server); xpc_service_free(pc_service); + xpc_service_free(debug_service); return 1; } logger("Successfully launched app with PID: %" PRIu64 "", pid); From 922eafc811b2f383ab3722f847eb3662c00b6ced Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Sat, 29 Mar 2025 10:59:39 -0600 Subject: [PATCH 3/4] Don't free the adapter after debug proxy ownership --- StikJIT/idevice/jit.c | 1 - 1 file changed, 1 deletion(-) diff --git a/StikJIT/idevice/jit.c b/StikJIT/idevice/jit.c index 8ca2552..0bf169f 100644 --- a/StikJIT/idevice/jit.c +++ b/StikJIT/idevice/jit.c @@ -207,7 +207,6 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l if (attach_cmd == NULL) { logger("Failed to create attach command"); debug_proxy_free(debug_proxy); - adapter_free(debug_adapter); xpc_service_free(debug_service); process_control_free(process_control); remote_server_free(remote_server); From 03f61699cec5661939214a75c8ba0d37920a561a Mon Sep 17 00:00:00 2001 From: Jackson Coxson Date: Sat, 29 Mar 2025 11:01:39 -0600 Subject: [PATCH 4/4] Free the process control service on success --- StikJIT/idevice/jit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/StikJIT/idevice/jit.c b/StikJIT/idevice/jit.c index 0bf169f..b93ff44 100644 --- a/StikJIT/idevice/jit.c +++ b/StikJIT/idevice/jit.c @@ -249,6 +249,7 @@ int debug_app(TcpProviderHandle* tcp_provider, const char *bundle_id, LogFuncC l *****************************************************************/ debug_proxy_free(debug_proxy); xpc_service_free(debug_service); + xpc_service_free(pc_service); logger("Debug session completed"); return 0;