accept null utf char (#37)

Kitura · Apr 16, 2018 · 592bd2a · 592bd2a
1 parent 5eaae44
commit 592bd2a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/Sources/KituraWebSocket/WebSocketConnection.swift b/Sources/KituraWebSocket/WebSocketConnection.swift
@@ -297,20 +297,15 @@ public class WebSocketConnection {
     }
 
     private func fireReceivedString(from: NSMutableData) {
-        var zero: CChar = 0
-        from.append(&zero, length: 1)
-        let bytes = from.bytes.bindMemory(to: CChar.self, capacity: 1)
-        if let text = String(cString: bytes, encoding: .utf8) {
-            callbackQueue.async { [weak self] in
-                if let strongSelf = self {
-                    strongSelf.service?.received(message: text, from: strongSelf)
-                }
-            }
-        }
-        else {
+        guard let text = String(data: Data(referencing: from), encoding: .utf8) else {
             closeConnection(reason: .invalidDataContents, description: "Failed to convert received payload to UTF-8 String", hard: true)
+            return
+        }
+        callbackQueue.async { [weak self] in
+            if let strongSelf = self {
+                strongSelf.service?.received(message: text, from: strongSelf)
+            }
         }
-        from.length -= 1
     }
 
     private func sendMessage(withOpCode: WSFrame.FrameOpcode, payload: UnsafeRawPointer?, payloadLength: Int) {

diff --git a/Tests/KituraWebSocketTests/BasicTests.swift b/Tests/KituraWebSocketTests/BasicTests.swift
@@ -311,6 +311,19 @@ class BasicTests: KituraTest {
         }
     }
 
+    func testNullCharacter() {
+        register(closeReason: .noReasonCodeSent)
+
+        performServerTest() { expectation in
+
+            let textPayload = self.payload(text: "\u{0}")
+
+            self.performTest(framesToSend: [(true, self.opcodeText, textPayload)],
+                             expectedFrames: [(true, self.opcodeText, textPayload)],
+                             expectation: expectation)
+        }
+    }
+
     func testUserDefinedCloseMessage() {
         register(closeReason: .userDefined(65535))