qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 05:24:39 -07:00
Code Releases Activity

cmd/compile/internal/noder,go/internal/gcimporter: return an error if not an archive file

Browse Source 
Return an error from FindExportData variants if the contents are not
an archive file.

Change-Id: I2fa8d3553638ef1de6a03e2ce46341f00ed6965f
Reviewed-on: https://go-review.googlesource.com/c/go/+/626697
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Griesemer <gri@google.com>
Commit-Queue: Tim King <taking@google.com>
This commit is contained in:
Tim King 2024-11-08 11:49:00 -08:00 committed by Go LUCI
parent 95c729cf06
commit 3efbc30f3d
5 changed files with 92 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/cmd/compile/internal/importer/exportdata.go
View File

@ -58,30 +58,32 @@ func FindExportData(r *bufio.Reader) (hdr string, size int, err error) {
return
}
if string(line) == "!<arch>\n" {
// Archive file. Scan to __.PKGDEF.
var name string
if name, size, err = readGopackHeader(r); err != nil {
return
}
// First entry should be __.PKGDEF.
if name != "__.PKGDEF" {
err = fmt.Errorf("go archive is missing __.PKGDEF")
return
}
// Read first line of __.PKGDEF data, so that line
// is once again the first line of the input.
if line, err = r.ReadSlice('\n'); err != nil {
err = fmt.Errorf("can't find export data (%v)", err)
return
}
// Is the first line an archive file signature?
if string(line) != "!<arch>\n" {
err = fmt.Errorf("not the start of an archive file (%q)", line)
return
}
// TODO(taking): The else case is likely dead. Otherwise, size<0. Return an error instead.
// Now at __.PKGDEF in archive or still at beginning of file.
// Either way, line should begin with "go object ".
// Archive file. Scan to __.PKGDEF.
var name string
if name, size, err = readGopackHeader(r); err != nil {
return
}
// First entry should be __.PKGDEF.
if name != "__.PKGDEF" {
err = fmt.Errorf("go archive is missing __.PKGDEF")
return
}
// Read first line of __.PKGDEF data, so that line
// is once again the first line of the input.
if line, err = r.ReadSlice('\n'); err != nil {
err = fmt.Errorf("can't find export data (%v)", err)
return
}
// Now at __.PKGDEF in archive. line should begin with "go object ".
if !strings.HasPrefix(string(line), "go object ") {
err = fmt.Errorf("not a Go object file")
return

22
src/cmd/compile/internal/importer/gcimporter_test.go
View File

@ -162,17 +162,29 @@ func TestVersionHandling(t *testing.T) {
// test that export data can be imported
_, err := Import(make(map[string]*types2.Package), pkgpath, dir, nil)
if err != nil {
// ok to fail if it fails with a no longer supported error for select files
// ok to fail if it fails with a 'not the start of an archive file' error for select files
if strings.Contains(err.Error(), "no longer supported") {
switch name {
case "test_go1.7_0.a", "test_go1.7_1.a",
"test_go1.8_4.a", "test_go1.8_5.a",
"test_go1.11_6b.a", "test_go1.11_999b.a":
case "test_go1.8_4.a",
"test_go1.8_5.a":
continue
}
// fall through
}
// ok to fail if it fails with a newer version error for select files
// ok to fail if it fails with a 'no longer supported' error for select files
if strings.Contains(err.Error(), "no longer supported") {
switch name {
case "test_go1.7_0.a",
"test_go1.7_1.a",
"test_go1.8_4.a",
"test_go1.8_5.a",
"test_go1.11_6b.a",
"test_go1.11_999b.a":
continue
}
// fall through
}
// ok to fail if it fails with a 'newer version' error for select files
if strings.Contains(err.Error(), "newer version") {
switch name {
case "test_go1.11_999i.a":

37
src/cmd/compile/internal/noder/import.go
View File

@ -266,27 +266,22 @@ func findExportData(f *os.File) (r *bio.Reader, end int64, err error) {
return
}
if line == "!<arch>\n" { // package archive
// package export block should be first
sz := int64(archive.ReadHeader(r.Reader, "__.PKGDEF"))
if sz <= 0 {
err = errors.New("not a package file")
return
}
end = r.Offset() + sz
line, err = r.ReadString('\n')
if err != nil {
return
}
} else {
// Not an archive; provide end of file instead.
// TODO(mdempsky): I don't think this happens anymore.
var fi os.FileInfo
fi, err = f.Stat()
if err != nil {
return
}
end = fi.Size()
// Is the first line an archive file signature?
if line != "!<arch>\n" {
err = fmt.Errorf("not the start of an archive file (%q)", line)
return
}
// package export block should be first
sz := int64(archive.ReadHeader(r.Reader, "__.PKGDEF"))
if sz <= 0 {
err = errors.New("not a package file")
return
}
end = r.Offset() + sz
line, err = r.ReadString('\n')
if err != nil {
return
}
if !strings.HasPrefix(line, "go object ") {

45
src/go/internal/gcimporter/exportdata.go
View File

@ -48,29 +48,32 @@ func FindExportData(r *bufio.Reader) (hdr string, size int, err error) {
return
}
if string(line) == "!<arch>\n" {
// Archive file. Scan to __.PKGDEF.
var name string
if name, size, err = readGopackHeader(r); err != nil {
return
}
// First entry should be __.PKGDEF.
if name != "__.PKGDEF" {
err = fmt.Errorf("go archive is missing __.PKGDEF")
return
}
// Read first line of __.PKGDEF data, so that line
// is once again the first line of the input.
if line, err = r.ReadSlice('\n'); err != nil {
err = fmt.Errorf("can't find export data (%v)", err)
return
}
// Is the first line an archive file signature?
if string(line) != "!<arch>\n" {
err = fmt.Errorf("not the start of an archive file (%q)", line)
return
}
// Now at __.PKGDEF in archive or still at beginning of file.
// Either way, line should begin with "go object ".
// Archive file. Scan to __.PKGDEF.
var name string
if name, size, err = readGopackHeader(r); err != nil {
return
}
// First entry should be __.PKGDEF.
if name != "__.PKGDEF" {
err = fmt.Errorf("go archive is missing __.PKGDEF")
return
}
// Read first line of __.PKGDEF data, so that line
// is once again the first line of the input.
if line, err = r.ReadSlice('\n'); err != nil {
err = fmt.Errorf("can't find export data (%v)", err)
return
}
// Now at __.PKGDEF in archive. line should begin with "go object ".
if !strings.HasPrefix(string(line), "go object ") {
err = fmt.Errorf("not a Go object file")
return

13
src/go/internal/gcimporter/gcimporter_test.go
View File

@ -285,7 +285,16 @@ func TestVersionHandling(t *testing.T) {
// test that export data can be imported
_, err := Import(fset, make(map[string]*types.Package), pkgpath, dir, nil)
if err != nil {
// ok to fail if it fails with a no longer supported error for select files
// ok to fail if it fails with a 'not the start of an archive file' error for select files
if strings.Contains(err.Error(), "not the start of an archive file") {
switch name {
case "test_go1.8_4.a",
"test_go1.8_5.a":
continue
}
// fall through
}
// ok to fail if it fails with a 'no longer supported' error for select files
if strings.Contains(err.Error(), "no longer supported") {
switch name {
case "test_go1.7_0.a",
@ -300,7 +309,7 @@ func TestVersionHandling(t *testing.T) {
}
// fall through
}
// ok to fail if it fails with a newer version error for select files
// ok to fail if it fails with a 'newer version' error for select files
if strings.Contains(err.Error(), "newer version") {
switch name {
case "test_go1.11_999i.a":