Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/bra/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ func (rc *readCloser) Read(p []byte) (int, error) {
return 0, fmt.Errorf("bra: error buffering: %w", err)
}

if rc.buf.Len() == 0 { // Buffer is empty and read closer returned EOF; no more data available
return 0, io.EOF
}

if rc.buf.Len() < rc.conv.Size() {
rc.n = rc.buf.Len()
}
Expand Down
24 changes: 24 additions & 0 deletions reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,30 @@ func TestFS(t *testing.T) {
}
}

func TestRead(t *testing.T) {
t.Parallel()

r, err := sevenzip.OpenReader(filepath.Join("testdata", "eof-read.7z"))
if err != nil {
t.Fatal(err)
}

defer func() {
if err := r.Close(); err != nil {
t.Fatal(err)
}
}()

file, err := r.Open("Plug 1.2/Plug 1.2.exe")
if err != nil {
t.Fatal(err)
}
_, err = io.ReadAll(file)
if err != nil {
t.Fatal(err)
}
}

func FuzzNewReaderWithPassword(f *testing.F) {
b, err := os.ReadFile(filepath.Join("testdata", "copy.7z"))
if err != nil {
Expand Down
Binary file added testdata/eof-read.7z
Binary file not shown.