aboutsummaryrefslogtreecommitdiff
path: root/src/archive
diff options
context:
space:
mode:
authorguoguangwu <guoguangwu@magic-shield.com>2024-02-25 12:59:23 +0000
committerGopher Robot <gobot@golang.org>2024-02-27 16:39:23 +0000
commit72743ca86c5d8c750f9a0132680bf45fde048429 (patch)
tree39301efa9680d85f96593144be918073c266f51f /src/archive
parentdfb2a894744fddfc7a93e3045f8296fb8e22add4 (diff)
downloadgo-72743ca86c5d8c750f9a0132680bf45fde048429.tar.gz
go-72743ca86c5d8c750f9a0132680bf45fde048429.zip
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>
Diffstat (limited to 'src/archive')
-rw-r--r--src/archive/tar/writer_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/archive/tar/writer_test.go b/src/archive/tar/writer_test.go
index a9936d6cd5..8b113a34e0 100644
--- 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/"