From 71cec4f6566dc258c8e980af85797c5a82d73fc4 Mon Sep 17 00:00:00 2001 From: Nethra Ravindran Date: Thu, 18 Oct 2018 12:03:00 +0530 Subject: [PATCH] Fix for conflicting memory access to delegate in ClientRequest --- Sources/KituraNet/ClientRequest.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/KituraNet/ClientRequest.swift b/Sources/KituraNet/ClientRequest.swift index 702adc9..76b872f 100644 --- a/Sources/KituraNet/ClientRequest.swift +++ b/Sources/KituraNet/ClientRequest.swift @@ -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 @@ -689,7 +689,7 @@ private class CurlInvoker { _ = curlHelperSetOptInt(handle, CURLOPT_HTTPGET, 1) } redirected = true - delegate?.prepareForRedirect() + delegate.prepareForRedirect() } else { redirected = false