From 25b6a6b6aad76b866e87b8dad8ac9a3ed7c26267 Mon Sep 17 00:00:00 2001
From: lawrencewuskyboxlabs <lawrence.wu@skyboxlabs.com>
Date: Mon, 22 Jun 2026 11:33:04 -0700
Subject: [PATCH] Utf8 pointer checks for Apple getSystemProxyForUri

---
 Source/Common/Apple/utils_apple.mm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Source/Common/Apple/utils_apple.mm b/Source/Common/Apple/utils_apple.mm
index 2eee8f26..f454b920 100644
--- a/Source/Common/Apple/utils_apple.mm
+++ b/Source/Common/Apple/utils_apple.mm
@@ -33,21 +33,24 @@ bool getSystemProxyForUri(const Uri& uri, Uri* outUri, String* outUsername, Stri
     NSString* proxyPassword = nil;
     if ([resolver getProxy:&proxyUrl withUsername:&proxyUsername andPassword:&proxyPassword])
     {
-        if (!outUri)
+        const char* proxyUrlUtf8 = [proxyUrl.absoluteString UTF8String];
+        if (!outUri || !proxyUrlUtf8)
         {
             return false;
         }
 
-        *outUri = Uri(String([proxyUrl.absoluteString UTF8String]));
-
-        if (outUsername && proxyUsername)
+        *outUri = Uri(String(proxyUrlUtf8));
+        
+        const char* proxyUsernameUtf8 = [proxyUsername UTF8String];
+        if (outUsername && proxyUsernameUtf8)
         {
-            *outUsername = String{ [proxyUsername UTF8String] };
+            *outUsername = String{ proxyUsernameUtf8 };
         }
-
-        if (outPassword && proxyPassword)
+        
+        const char* proxyPasswordUtf8 = [proxyPassword UTF8String];
+        if (outPassword && proxyPasswordUtf8)
         {
-            *outPassword = String{ [proxyPassword UTF8String] };
+            *outPassword = String{ proxyPasswordUtf8 };
         }
         return true;
     }