Skip to content

Commit

Permalink
fix(sync): close stream on read error (#1519)
Browse files Browse the repository at this point in the history
  • Loading branch information
themantre authored Oct 2, 2024
1 parent 38b278e commit 4b98b7a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
5 changes: 3 additions & 2 deletions sync/bundle/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,10 @@ func (b *Bundle) Encode() ([]byte, error) {

if util.IsFlagSet(b.Flags, BundleFlagCompressed) {
c, err := util.CompressBuffer(data)
if err == nil {
data = c
if err != nil {
return nil, err
}
data = c
}

msg := &_Bundle{
Expand Down
9 changes: 4 additions & 5 deletions sync/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -317,19 +317,18 @@ func (sync *synchronizer) processGossipMessage(msg *network.GossipMessage) {
func (sync *synchronizer) processStreamMessage(msg *network.StreamMessage) {
sync.logger.Debug("processing stream message", "pid", msg.From)

defer func() {
_ = msg.Reader.Close()
}()

bdl, err := sync.firewall.OpenStreamBundle(msg.Reader, msg.From)
if err != nil {
sync.logger.Debug("error on parsing a Stream bundle",
"from", msg.From, "bundle", bdl, "error", err)

return
}
if err := msg.Reader.Close(); err != nil {
// TODO: write test for me
sync.logger.Debug("error on closing stream", "error", err, "source", msg.From)

return
}
sync.processIncomingBundle(bdl, msg.From)
}

Expand Down

0 comments on commit 4b98b7a

Please sign in to comment.