From fa646d1119762b701602ecf537656c7388ca6140 Mon Sep 17 00:00:00 2001
From: Timo Savola <timo.savola@gmail.com>
Date: Fri, 19 Feb 2010 18:40:09 -0800
Subject: websocket: fix binary frame size decoding

R=ukai, rsc
CC=golang-dev
http://codereview.appspot.com/166074

Committer: Russ Cox <rsc@golang.org>
---
 src/pkg/websocket/websocket.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go
index 80ca49b94..bcb42f508 100644
--- a/src/pkg/websocket/websocket.go
+++ b/src/pkg/websocket/websocket.go
@@ -64,9 +64,8 @@ func (ws *Conn) Read(msg []byte) (n int, err os.Error) {
 				if err != nil {
 					return n, err
 				}
-				if (c & 0x80) == 0x80 {
-					length = length*128 + int(c&0x7f)
-				} else {
+				length = length*128 + int(c&0x7f)
+				if (c & 0x80) == 0 {
 					break
 				}
 			}
-- 
cgit v1.2.3