Make sure modification accesses are exclusive

zhuhaow · May 10, 2018 · 065be82 · 065be82
1 parent 612aa91
commit 065be82
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/src/Socket/AdapterSocket/Shadowsocks/ProtocolObfuscater.swift b/src/Socket/AdapterSocket/Shadowsocks/ProtocolObfuscater.swift
@@ -349,17 +349,16 @@ extension ShadowsocksAdapter {
                 var unpackedData = Data()
                 while buffer.left > 5 {
                     buffer.skip(3)
-                    if !buffer.withUnsafeBytes({ (ptr: UnsafePointer<UInt16>) -> Bool in
-                        let length = Int(ptr.pointee.byteSwapped)
-                        self.buffer.skip(2)
-                        if self.buffer.left >= length {
-                            unpackedData.append(self.buffer.get(length: length)!)
-                            return true
-                        } else {
-                            self.buffer.setBack(length: 5)
-                            return false
-                        }
-                    }) {
+                    var length: Int = 0
+                    buffer.withUnsafeBytes({ (ptr: UnsafePointer<UInt16>) in
+                        length = Int(ptr.pointee.byteSwapped)
+                    })
+                    buffer.skip(2)
+                    if buffer.left >= length {
+                        unpackedData.append(buffer.get(length: length)!)
+                        continue
+                    } else {
+                        buffer.setBack(length: 5)
                         break
                     }
                 }

diff --git a/src/Utils/Buffer.swift b/src/Utils/Buffer.swift
@@ -24,8 +24,9 @@ struct Buffer {
             return
         }
 
+        let buffer_ = buffer
         buffer.withUnsafeMutableBytes {
-            buffer.copyBytes(to: $0, from: offset..<buffer.count)
+            buffer_.copyBytes(to: $0, from: offset..<buffer_.count)
         }
         buffer.replaceSubrange(buffer.count - offset ..< buffer.count, with: Data())
         offset = 0