cmd/internal/goobj: permit 0 bytes in export data (prep. for new export format)

Change-Id: Ida9a82a5420a41ef656388866a1cf8fadf12ccc6
Reviewed-on: https://go-review.googlesource.com/16220
Reviewed-by: Chris Manghane <cmang@golang.org>

diff --git a/src/cmd/internal/goobj/read.go b/src/cmd/internal/goobj/read.go
index 1b0c9646bc8a6d00a4f40115d5602eeddb9fe5db..7fdaf557c81500a11bf63a81ebcf6efc5cdbae7b 100644 (file)
--- a/src/cmd/internal/goobj/read.go
+++ b/src/cmd/internal/goobj/read.go
@@ -564,7 +564,9 @@ func (r *objReader) parseObject(prefix []byte) error {
        var c1, c2, c3 byte
        for {
                c1, c2, c3 = c2, c3, r.readByte()
-               if c3 == 0 { // NUL or EOF, either is bad
+               // The new export format can contain 0 bytes.
+               // Don't consider them errors, only look for r.err != nil.
+               if r.err != nil {
                        return errCorruptObject
                }
                if c1 == '\n' && c2 == '!' && c3 == '\n' {