From aa368f92cfae4bdc2b02ab4da4544a5c5c4b5f3f Mon Sep 17 00:00:00 2001 From: Erik Date: Fri, 16 Oct 2015 12:39:45 -0400 Subject: [PATCH] don't force unwrap in fixutf --- SocketIOClientSwift/SocketFixUTF8.swift | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/SocketIOClientSwift/SocketFixUTF8.swift b/SocketIOClientSwift/SocketFixUTF8.swift index 0cffd86..a336d03 100644 --- a/SocketIOClientSwift/SocketFixUTF8.swift +++ b/SocketIOClientSwift/SocketFixUTF8.swift @@ -26,13 +26,15 @@ import Foundation func fixDoubleUTF8(inout name: String) { - let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding)! - let latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding)! - name = latin1 as String + if let utf8 = name.dataUsingEncoding(NSISOLatin1StringEncoding), + latin1 = NSString(data: utf8, encoding: NSUTF8StringEncoding) { + name = latin1 as String + } } func doubleEncodeUTF8(inout str: String) { - let latin1 = str.dataUsingEncoding(NSUTF8StringEncoding)! - let utf8 = NSString(data: latin1, encoding: NSISOLatin1StringEncoding)! - str = utf8 as String + if let latin1 = str.dataUsingEncoding(NSUTF8StringEncoding), + utf8 = NSString(data: latin1, encoding: NSISOLatin1StringEncoding) { + str = utf8 as String + } }