浏览代码

Merge pull request #358 from Zariel/fix-stream-signed

Fix reading the streamID sign
Chris Bannister 10 年之前
父节点
当前提交
30aa70a1dd
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      frame.go

+ 2 - 2
frame.go

@@ -297,11 +297,11 @@ func readHeader(r io.Reader, p []byte) (head frameHeader, err error) {
 
 
 	head.flags = p[1]
 	head.flags = p[1]
 	if version > protoVersion2 {
 	if version > protoVersion2 {
-		head.stream = int(readShort(p[2:]))
+		head.stream = int(int16(p[2])<<8 | int16(p[3]))
 		head.op = frameOp(p[4])
 		head.op = frameOp(p[4])
 		head.length = int(readInt(p[5:]))
 		head.length = int(readInt(p[5:]))
 	} else {
 	} else {
-		head.stream = int(p[2])
+		head.stream = int(int8(p[2]))
 		head.op = frameOp(p[3])
 		head.op = frameOp(p[3])
 		head.length = int(readInt(p[4:]))
 		head.length = int(readInt(p[4:]))
 	}
 	}