Fixed bug that read failed from conn

limingxinleo · limingxinleo · commit 02e953ee3a67 · 2022-04-06T16:52:25.000+08:00
diff --git a/server/tcp_server.go b/server/tcp_server.go
@@ -53,7 +53,7 @@ func (s *TcpServer) Start() {
 }
 
 func (s *TcpServer) readAll(conn net.Conn, length int) ([]byte, error) {
-	ret := make([]byte, length)
+	ret := make([]byte, 0, length)
 	recvLength := 0
 	var l int
 	var err error
@@ -64,8 +64,8 @@ func (s *TcpServer) readAll(conn net.Conn, length int) ([]byte, error) {
 			return nil, err
 		}
 
+		ret = append(ret, bt[0:l]...)
 		recvLength += l
-		ret = append(ret, bt...)
 		if recvLength >= length {
 			return ret, nil
 		}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (s *TcpServer) Start() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func (s *TcpServer) readAll(conn net.Conn, length int) ([]byte, error) {`
`56`		`- ret := make([]byte, length)`
	`56`	`+ ret := make([]byte, 0, length)`
`57`	`57`	`recvLength := 0`
`58`	`58`	`var l int`
`59`	`59`	`var err error`
`@@ -64,8 +64,8 @@ func (s *TcpServer) readAll(conn net.Conn, length int) ([]byte, error) {`
`64`	`64`	`return nil, err`
`65`	`65`	`}`
`66`	`66`
	`67`	`+ ret = append(ret, bt[0:l]...)`
`67`	`68`	`recvLength += l`
`68`		`- ret = append(ret, bt...)`
`69`	`69`	`if recvLength >= length {`
`70`	`70`	`return ret, nil`
`71`	`71`	`}`