Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

archive/zip: handle files with data descriptors

Browse source 
Fixes #1471.

R=rsc
CC=golang-dev
https://golang.org/cl/4183048
This commit is contained in:
Andrew Gerrand 2011-02-15 05:42:16 +11:00
parent 1778f50da3
commit 858972c3f9
4 changed files with 57 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/pkg/archive/zip/reader_test.go
View file

@ -52,6 +52,15 @@ var tests = []ZipTest{
},
{Name: "readme.zip"},
{Name: "readme.notzip", Error: FormatError},
{
Name: "dd.zip",
File: []ZipTestFile{
{
Name: "filename",
Content: []byte("This is a test textfile.\n"),
},
},
},
}
func TestReader(t *testing.T) {
@ -102,16 +111,18 @@ func readTestZip(t *testing.T, zt ZipTest) {
}
// test invalid checksum
z.File[0].CRC32++ // invalidate
r, err := z.File[0].Open()
if err != nil {
t.Error(err)
return
}
var b bytes.Buffer
_, err = io.Copy(&b, r)
if err != ChecksumError {
t.Errorf("%s: copy error=%v, want %v", z.File[0].Name, err, ChecksumError)
if !z.File[0].hasDataDescriptor() { // skip test when crc32 in dd
z.File[0].CRC32++ // invalidate
r, err := z.File[0].Open()
if err != nil {
t.Error(err)
return
}
var b bytes.Buffer
_, err = io.Copy(&b, r)
if err != ChecksumError {
t.Errorf("%s: copy error=%v, want %v", z.File[0].Name, err, ChecksumError)
}
}
}