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

debug/macho: don't crash when reading non-Mach-O files

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/838046
This commit is contained in:
Robert Griesemer 2010-04-01 15:36:44 -07:00
parent d4a1619733
commit 4a6dfda4cc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pkg/debug/macho/file.go
View File

@ -167,7 +167,7 @@ func NewFile(r io.ReaderAt) (*File, os.Error) {
// Read and decode Mach magic to determine byte order, size. // Read and decode Mach magic to determine byte order, size.
// Magic32 and Magic64 differ only in the bottom bit. // Magic32 and Magic64 differ only in the bottom bit.
var ident [4]uint8 var ident [4]byte
if _, err := r.ReadAt(&ident, 0); err != nil { if _, err := r.ReadAt(&ident, 0); err != nil {
return nil, err return nil, err
} }
@ -180,6 +180,8 @@ func NewFile(r io.ReaderAt) (*File, os.Error) {
case le &^ 1: case le &^ 1:
f.ByteOrder = binary.LittleEndian f.ByteOrder = binary.LittleEndian
f.Magic = le f.Magic = le
default:
return nil, &FormatError{0, "invalid magic number", nil}
} }
// Read entire file header. // Read entire file header.

8
src/pkg/debug/macho/file_test.go
View File

@ -157,3 +157,11 @@ func TestOpen(t *testing.T) {
} }
} }
func TestOpenFailure(t *testing.T) {
filename := "file.go" // not a Mach-O file
_, err := Open(filename) // don't crash
if err == nil {
t.Errorf("open %s: succeeded unexpectedly", filename)
}
}