diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-06-06 17:59:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-06 17:59:58 +0200 |
| commit | 60033b8925a18fff9f68bea3d980076f73eb3cb5 (patch) | |
| tree | 7dc31884db392754f7bf52c027e06434e7962ab5 /plumbing/format/packfile/packfile.go | |
| parent | 37b80726760d2e0b17dfa437f3162dd930590ecf (diff) | |
| parent | ec647e9f02339a93c2856cc93b6b1b6090a36c06 (diff) | |
| download | go-git-60033b8925a18fff9f68bea3d980076f73eb3cb5.tar.gz | |
Merge pull request #1159 from ebardsley/pool
plumbing: format/packfile, Fix data race and resource leak.
Diffstat (limited to 'plumbing/format/packfile/packfile.go')
| -rw-r--r-- | plumbing/format/packfile/packfile.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plumbing/format/packfile/packfile.go b/plumbing/format/packfile/packfile.go index f528073..21a15de 100644 --- a/plumbing/format/packfile/packfile.go +++ b/plumbing/format/packfile/packfile.go @@ -133,8 +133,8 @@ func (p *Packfile) getObjectSize(h *ObjectHeader) (int64, error) { return h.Length, nil case plumbing.REFDeltaObject, plumbing.OFSDeltaObject: buf := bufPool.Get().(*bytes.Buffer) - buf.Reset() defer bufPool.Put(buf) + buf.Reset() if _, _, err := p.s.NextObject(buf); err != nil { return 0, err @@ -222,11 +222,11 @@ func (p *Packfile) getNextObject(h *ObjectHeader, hash plumbing.Hash) (plumbing. // optimization only if the expanded version of the object still meets // the small object threshold condition. buf := bufPool.Get().(*bytes.Buffer) + defer bufPool.Put(buf) buf.Reset() if _, _, err := p.s.NextObject(buf); err != nil { return nil, err } - defer bufPool.Put(buf) size = p.getDeltaObjectSize(buf) if size <= smallObjectThreshold { @@ -321,12 +321,12 @@ func (p *Packfile) fillRegularObjectContent(obj plumbing.EncodedObject) error { func (p *Packfile) fillREFDeltaObjectContent(obj plumbing.EncodedObject, ref plumbing.Hash) error { buf := bufPool.Get().(*bytes.Buffer) + defer bufPool.Put(buf) buf.Reset() _, _, err := p.s.NextObject(buf) if err != nil { return err } - defer bufPool.Put(buf) return p.fillREFDeltaObjectContentWithBuffer(obj, ref, buf) } @@ -351,12 +351,12 @@ func (p *Packfile) fillREFDeltaObjectContentWithBuffer(obj plumbing.EncodedObjec func (p *Packfile) fillOFSDeltaObjectContent(obj plumbing.EncodedObject, offset int64) error { buf := bufPool.Get().(*bytes.Buffer) + defer bufPool.Put(buf) buf.Reset() _, _, err := p.s.NextObject(buf) if err != nil { return err } - defer bufPool.Put(buf) return p.fillOFSDeltaObjectContentWithBuffer(obj, offset, buf) } |