Skip to content

Commit

Permalink
improve error handling in writePacket
Browse files Browse the repository at this point in the history
* handle error before success case.
* return io.ErrShortWrite if not all bytes were written but err is nil.
* return err instead of ErrInvalidConn.
  • Loading branch information
methane committed Jun 16, 2024
1 parent 52c1917 commit e965e01
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions packets.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,32 +124,32 @@ func (mc *mysqlConn) writePacket(data []byte) error {
}

n, err := mc.netConn.Write(data[:4+size])
if err == nil && n == 4+size {
mc.sequence++
if size != maxPacketSize {
return nil
}
pktLen -= size
data = data[size:]
continue
}

// Handle error
if err == nil { // n != len(data)
mc.cleanup()
mc.log(ErrMalformPkt)
} else {
if err != nil {
if cerr := mc.canceled.Value(); cerr != nil {
return cerr
}
mc.cleanup()
if n == 0 && pktLen == len(data)-4 {
// only for the first loop iteration when nothing was written yet
mc.log(err)
return errBadConnNoWrite
} else {
return err
}
}
if n != 4+size {
// io.Writer(b) must return a non-nil error if it cannot write len(b) bytes.
// The io.ErrShortWrite error is used to indicate that this rule has not been followed.
mc.cleanup()
mc.log(err)
return io.ErrShortWrite
}

mc.sequence++
if size != maxPacketSize {
return nil
}
return ErrInvalidConn
pktLen -= size
data = data[size:]
}
}

Expand Down

0 comments on commit e965e01

Please sign in to comment.