From 16c45a7587cc3b72df763fedcfa370692bf46cc4 Mon Sep 17 00:00:00 2001
From: Matt Bell <mappum@gmail.com>
Date: Sat, 24 Jan 2015 05:35:05 -0800
Subject: [PATCH] unixfs/tar: Fixed reader not properly buffering headers
---
unixfs/tar/reader.go | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/unixfs/tar/reader.go b/unixfs/tar/reader.go
index 725e6867f..081d816a2 100644
--- a/unixfs/tar/reader.go
+++ b/unixfs/tar/reader.go
@@ -79,6 +79,7 @@ func (i *Reader) writeToBuf(dagnode *mdag.Node, path string, depth int) {
i.emitError(err)
return
}
+ i.flush()
for _, link := range dagnode.Links {
childNode, err := link.GetNode(i.dag)
@@ -102,6 +103,7 @@ func (i *Reader) writeToBuf(dagnode *mdag.Node, path string, depth int) {
i.emitError(err)
return
}
+ i.flush()
reader, err := uio.NewDagReader(dagnode, i.dag)
if err != nil {
@@ -150,6 +152,11 @@ func (i *Reader) signal() {
i.signalChan <- struct{}{}
}
+func (i *Reader) flush() {
+ i.signal()
+ <-i.signalChan
+}
+
func (i *Reader) emitError(err error) {
i.err = err
i.signal()
@@ -157,10 +164,6 @@ func (i *Reader) emitError(err error) {
func (i *Reader) close() {
i.closed = true
- i.flush()
-}
-
-func (i *Reader) flush() {
defer i.signal()
err := i.writer.Close()
if err != nil {
@@ -185,9 +188,7 @@ func (i *Reader) syncCopy(reader io.Reader) error {
if err != nil {
return err
}
- i.signal()
- // wait for Read to finish reading
- <-i.signalChan
+ i.flush()
}
if err == io.EOF {
break
--
GitLab