Skip to content

Commit

Permalink
BWT: fix segfault for access to nil body message (#206)
Browse files Browse the repository at this point in the history
  • Loading branch information
jkralik committed Feb 7, 2021
1 parent 38a0437 commit fe45892
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions net/blockwise/blockwise.go
Original file line number Diff line number Diff line change
Expand Up @@ -759,16 +759,23 @@ func (b *BlockWise) processReceivedMessage(w ResponseWriter, r Message, maxSzx S
if err != nil {
return fmt.Errorf("cannot seek to off(%v) of cached request: %w", off, err)
}
_, err = r.Body().Seek(0, io.SeekStart)
if err != nil {
return fmt.Errorf("cannot seek to start of request: %w", err)
if r.Body() != nil {
_, err = r.Body().Seek(0, io.SeekStart)
if err != nil {
return fmt.Errorf("cannot seek to start of request: %w", err)
}
written, err := io.Copy(payloadFile, r.Body())
if err != nil {
return fmt.Errorf("cannot copy to cached request: %w", err)
}
payloadSize = copyn + written
} else {
payloadSize = copyn
}
written, err := io.Copy(payloadFile, r.Body())
err = payloadFile.Truncate(payloadSize)
if err != nil {
return fmt.Errorf("cannot copy to cached request: %w", err)
return fmt.Errorf("cannot truncate cached request: %w", err)
}
payloadSize = copyn + written

}
if !more {
b.receivingMessagesCache.Delete(tokenStr)
Expand Down

0 comments on commit fe45892

Please sign in to comment.