Commit81afa8a

committed

netconn: Avoid returning 0, nil in NetConn.Read

Closes#367

1 parenta02cbef commit81afa8aCopy full SHA for 81afa8a

File tree

+13

-0

lines changed

+13

-0

lines changed

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,19 @@ func (nc *netConn) Read(p []byte) (int, error) {`
`141`	`141`	`nc.readMu.forceLock()`
`142`	`142`	`defernc.readMu.unlock()`
`143`	`143`
	`144`	`+for {`
	`145`	`+n,err:=nc.read(p)`
	`146`	`+iferr!=nil {`
	`147`	`+returnn,err`
	`148`	`+}`
	`149`	`+ifn==0 {`
	`150`	`+continue`
	`151`	`+}`
	`152`	`+returnn,nil`
	`153`	`+}`
	`154`	`+}`
	`155`	`+`
	`156`	`+func (nc*netConn)read(p []byte) (int,error) {`
`144`	`157`	`ifatomic.LoadInt64(&nc.readExpired)==1 {`
`145`	`158`	`return0,fmt.Errorf("failed to read: %w",context.DeadlineExceeded)`
`146`	`159`	`}`

Comments

(0)