Skip to content
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

Enforce exclusive memory access to delegate in ClientRequest #278

Merged
merged 2 commits into from
Nov 30, 2018
Merged

Enforce exclusive memory access to delegate in ClientRequest #278

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71cec4f
Fix for conflicting memory access to delegate in ClientRequest
nethraravindran Oct 18, 2018
d0504a9
Merge branch 'master' into memory-access
djones6 Nov 13, 2018
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
6 changes: 3 additions & 3 deletions Sources/KituraNet/ClientRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,11 +659,11 @@ private class CurlInvoker {
fileprivate func invoke() -> CURLcode {

var rc: CURLcode = CURLE_FAILED_INIT
if delegate == nil {
guard let delegate = self.delegate else {
return rc
}

withUnsafeMutablePointer(to: &delegate) {ptr in
withUnsafeMutablePointer(to: &self.delegate) {ptr in
self.prepareHandle(ptr)

var redirected = false
Expand All @@ -689,7 +689,7 @@ private class CurlInvoker {
_ = curlHelperSetOptInt(handle, CURLOPT_HTTPGET, 1)
}
redirected = true
delegate?.prepareForRedirect()
delegate.prepareForRedirect()
}
else {
redirected = false
Expand Down