From 447fb3a9139dfda864da81dcf08c3b47463b7795 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Mon, 4 Feb 2013 00:01:14 +0100 Subject: [PATCH] Adding lock around AFURLConnectionOperation -responseStringEncoding Adding check for self.response in AFURLConnectionOperation -responseStringEncoding --- AFNetworking/AFURLConnectionOperation.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m index bb8bf55..1fc61db 100644 --- a/AFNetworking/AFURLConnectionOperation.m +++ b/AFNetworking/AFURLConnectionOperation.m @@ -367,7 +367,7 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat - (NSStringEncoding)responseStringEncoding { [self.lock lock]; - if (!_responseStringEncoding) { + if (!_responseStringEncoding && self.response) { NSStringEncoding stringEncoding = NSUTF8StringEncoding; if (self.response.textEncodingName) { CFStringEncoding IANAEncoding = CFStringConvertIANACharSetNameToEncoding((__bridge CFStringRef)self.response.textEncodingName);