Fixing a bug and small cleanup.

blownengine · Sep 26, 2010 · fd6c944 · fd6c944
1 parent 1f87fc2
commit fd6c944
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/WebSocketMain.swf b/WebSocketMain.swf
diff --git a/WebSocketMainInsecure.zip b/WebSocketMainInsecure.zip
diff --git a/flash-src/WebSocket.as b/flash-src/WebSocket.as
@@ -279,15 +279,13 @@ public class WebSocket extends EventDispatcher {
           }
           buffer.position = 1;
           var data:String = "";
-          for(var i:int = 1, zeroByte:String = String.fromCharCode(0x00); i <= pos; i++) {
+          for(var i:int = 1; i < pos; i++) {
             if (buffer[i] == 0x00) {
-              data += buffer.readUTFBytes(pos - buffer.position) + zeroByte;
+              data += buffer.readUTFBytes(i - buffer.position) + "\x00";
               buffer.position = i + 1;
-
-            } else if (buffer[i] == 0xff) {
-              data += buffer.readUTFBytes(buffer.bytesAvailable - 1);
             }
           }
+          data += buffer.readUTFBytes(pos - buffer.position);
           main.log("received: " + data);
           dataQueue.push(encodeURIComponent(data));
           dispatchEvent(new Event("message"));