Skip to content

Apple: Fix _platform_strlen crashes inside getSystemProxyForUri #997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lawrencewuskyboxlabs wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −8
Open

Apple: Fix _platform_strlen crashes inside getSystemProxyForUri #997

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Source/Common/Apple/utils_apple.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down