From: Timo Savola <timo.savola@gmail.com>
Date: Sat, 20 Feb 2010 02:40:09 +0000 (-0800)
Subject: websocket: fix binary frame size decoding
X-Git-Tag: weekly.2010-02-23~23
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=4f8a000e1735bac3db06d61fe9e78a649d381378;p=gostls13.git

websocket: fix binary frame size decoding

R=ukai, rsc
CC=golang-dev
https://golang.org/cl/166074
---

diff --git a/src/pkg/websocket/websocket.go b/src/pkg/websocket/websocket.go
index 80ca49b947..bcb42f508a 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
 				}
 			}