archive/tar: check returned error before use hdr

Change-Id: I8c28dac73427e37d58d970b00d8f0f1413bede2e
GitHub-Last-Rev: a11a8036028ecf6f811b1470becc924b77a2c734
GitHub-Pull-Request: golang/go#65932
Reviewed-on: https://go-review.googlesource.com/c/go/+/566695
Auto-Submit: Ian Lance Taylor <iant@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
Reviewed-by: Joseph Tsai <joetsai@digital-static.net>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
index a9936d6cd526fe54d7424c22cc20fcded4152ca2..8b113a34e0d15dc4d84f5fbd5b00ea7839e41f6f 100644 (file)
--- a/src/archive/tar/writer_test.go
+++ b/src/archive/tar/writer_test.go
@@ -581,10 +581,10 @@ func TestPaxSymlink(t *testing.T) {
                t.Fatal(err)
        }
        hdr, err := FileInfoHeader(fileinfo, "")
-       hdr.Typeflag = TypeSymlink
        if err != nil {
                t.Fatalf("os.Stat:1 %v", err)
        }
+       hdr.Typeflag = TypeSymlink
        // Force a PAX long linkname to be written
        longLinkname := strings.Repeat("1234567890/1234567890", 10)
        hdr.Linkname = longLinkname
@@ -761,10 +761,10 @@ func TestUSTARLongName(t *testing.T) {
                t.Fatal(err)
        }
        hdr, err := FileInfoHeader(fileinfo, "")
-       hdr.Typeflag = TypeDir
        if err != nil {
                t.Fatalf("os.Stat:1 %v", err)
        }
+       hdr.Typeflag = TypeDir
        // Force a PAX long name to be written. The name was taken from a practical example
        // that fails and replaced ever char through numbers to anonymize the sample.
        longName := "/0000_0000000/00000-000000000/0000_0000000/00000-0000000000000/0000_0000000/00000-0000000-00000000/0000_0000000/00000000/0000_0000000/000/0000_0000000/00000000v00/0000_0000000/000000/0000_0000000/0000000/0000_0000000/00000y-00/0000/0000/00000000/0x000000/"