Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #247 from JohnStarich/bugfix/zipfs-read-small-file
Fix panic when not filling up zipfs's read buffer
- Loading branch information
Showing
3 changed files
with
44 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
package zipfs | ||
|
||
import ( | ||
"archive/zip" | ||
"io" | ||
"testing" | ||
) | ||
|
||
func TestFileRead(t *testing.T) { | ||
zrc, err := zip.OpenReader("testdata/small.zip") | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
zfs := New(&zrc.Reader) | ||
f, err := zfs.Open("smallFile") | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
info, err := f.Stat() | ||
if err != nil { | ||
t.Fatal(err) | ||
} | ||
chunkSize := info.Size() * 2 // read with extra large buffer | ||
|
||
buf := make([]byte, chunkSize) | ||
n, err := f.Read(buf) | ||
if err != io.EOF { | ||
t.Fatal("Failed to read file to completion:", err) | ||
} | ||
if n != int(info.Size()) { | ||
t.Errorf("Expected read length to be %d, found: %d", info.Size(), n) | ||
} | ||
|
||
// read a second time to check f.offset and f.buf are correct | ||
buf = make([]byte, chunkSize) | ||
n, err = f.Read(buf) | ||
if err != io.EOF { | ||
t.Fatal("Failed to read a fully read file:", err) | ||
} | ||
if n != 0 { | ||
t.Errorf("Expected read length to be 0, found: %d", n) | ||
} | ||
} |
Binary file not shown.