From b8a2cda48b51cf88092d02ad2871d77f98b4adb5 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Thu, 17 Dec 2020 22:51:44 +0000 Subject: [PATCH] vendor: vendor gitobj v2.0.1 --- vendor/github.com/git-lfs/gitobj/v2/SECURITY.md | 4 ++++ vendor/github.com/git-lfs/gitobj/v2/commit.go | 2 +- vendor/github.com/git-lfs/gitobj/v2/pack/index.go | 2 +- vendor/github.com/git-lfs/gitobj/v2/pack/index_v1.go | 2 +- vendor/github.com/git-lfs/gitobj/v2/pack/index_v2.go | 2 +- vendor/github.com/git-lfs/gitobj/v2/pack/packfile.go | 2 +- vendor/github.com/git-lfs/gitobj/v2/tree.go | 4 +++- vendor/modules.txt | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 vendor/github.com/git-lfs/gitobj/v2/SECURITY.md diff --git a/vendor/github.com/git-lfs/gitobj/v2/SECURITY.md b/vendor/github.com/git-lfs/gitobj/v2/SECURITY.md new file mode 100644 index 00000000..93dd038f --- /dev/null +++ b/vendor/github.com/git-lfs/gitobj/v2/SECURITY.md @@ -0,0 +1,4 @@ +Please see +[SECURITY.md](https://github.com/git-lfs/git-lfs/blob/master/SECURITY.md) +in the main Git LFS repository for information on how to report security +vulnerabilities in this package. diff --git a/vendor/github.com/git-lfs/gitobj/v2/commit.go b/vendor/github.com/git-lfs/gitobj/v2/commit.go index daf3be58..ed7d3354 100644 --- a/vendor/github.com/git-lfs/gitobj/v2/commit.go +++ b/vendor/github.com/git-lfs/gitobj/v2/commit.go @@ -97,7 +97,7 @@ func (c *Commit) Decode(hash hash.Hash, from io.Reader, size int64) (n int, err var messageParts []string s := bufio.NewScanner(from) - s.Buffer(nil, 1024*1024) + s.Buffer(nil, 10*1024*1024) for s.Scan() { text := s.Text() n = n + len(text+"\n") diff --git a/vendor/github.com/git-lfs/gitobj/v2/pack/index.go b/vendor/github.com/git-lfs/gitobj/v2/pack/index.go index 2d046501..a65f7967 100644 --- a/vendor/github.com/git-lfs/gitobj/v2/pack/index.go +++ b/vendor/github.com/git-lfs/gitobj/v2/pack/index.go @@ -7,7 +7,7 @@ import ( "io" ) -const maxHashSize = sha256.Size +const MaxHashSize = sha256.Size // Index stores information about the location of objects in a corresponding // packfile. diff --git a/vendor/github.com/git-lfs/gitobj/v2/pack/index_v1.go b/vendor/github.com/git-lfs/gitobj/v2/pack/index_v1.go index e7170cf6..f918ce14 100644 --- a/vendor/github.com/git-lfs/gitobj/v2/pack/index_v1.go +++ b/vendor/github.com/git-lfs/gitobj/v2/pack/index_v1.go @@ -13,7 +13,7 @@ type V1 struct { // Name implements IndexVersion.Name by returning the 20 byte SHA-1 object name // for the given entry at offset "at" in the v1 index file "idx". func (v *V1) Name(idx *Index, at int64) ([]byte, error) { - var sha [maxHashSize]byte + var sha [MaxHashSize]byte hashlen := v.hash.Size() diff --git a/vendor/github.com/git-lfs/gitobj/v2/pack/index_v2.go b/vendor/github.com/git-lfs/gitobj/v2/pack/index_v2.go index 85f37b4b..370d2db7 100644 --- a/vendor/github.com/git-lfs/gitobj/v2/pack/index_v2.go +++ b/vendor/github.com/git-lfs/gitobj/v2/pack/index_v2.go @@ -13,7 +13,7 @@ type V2 struct { // Name implements IndexVersion.Name by returning the 20 byte SHA-1 object name // for the given entry at offset "at" in the v2 index file "idx". func (v *V2) Name(idx *Index, at int64) ([]byte, error) { - var sha [maxHashSize]byte + var sha [MaxHashSize]byte hashlen := v.hash.Size() diff --git a/vendor/github.com/git-lfs/gitobj/v2/pack/packfile.go b/vendor/github.com/git-lfs/gitobj/v2/pack/packfile.go index f5612139..0ff0f9b2 100644 --- a/vendor/github.com/git-lfs/gitobj/v2/pack/packfile.go +++ b/vendor/github.com/git-lfs/gitobj/v2/pack/packfile.go @@ -190,7 +190,7 @@ func (p *Packfile) findBase(typ PackedObjectType, offset, objOffset int64) (Chai // We assume that we have to read at least an object ID's worth (the // hash length in the case of a OBJ_REF_DELTA, or greater than the // length of the base offset encoded in an OBJ_OFS_DELTA). - var sha [32]byte + var sha [MaxHashSize]byte if _, err := p.r.ReadAt(sha[:hashlen], offset); err != nil { return nil, baseOffset, err } diff --git a/vendor/github.com/git-lfs/gitobj/v2/tree.go b/vendor/github.com/git-lfs/gitobj/v2/tree.go index 070b1764..a0e01b07 100644 --- a/vendor/github.com/git-lfs/gitobj/v2/tree.go +++ b/vendor/github.com/git-lfs/gitobj/v2/tree.go @@ -10,6 +10,8 @@ import ( "strconv" "strings" "syscall" + + "github.com/git-lfs/gitobj/v2/pack" ) // Tree encapsulates a Git tree object. @@ -53,7 +55,7 @@ func (t *Tree) Decode(hash hash.Hash, from io.Reader, size int64) (n int, err er n += len(fname) fname = strings.TrimSuffix(fname, "\x00") - var sha [32]byte + var sha [pack.MaxHashSize]byte if _, err = io.ReadFull(buf, sha[:hashlen]); err != nil { return n, err } diff --git a/vendor/modules.txt b/vendor/modules.txt index 30f52f6f..583d7507 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8,7 +8,7 @@ github.com/avast/retry-go github.com/davecgh/go-spew/spew # github.com/dpotapov/go-spnego v0.0.0-20190506202455-c2c609116ad0 github.com/dpotapov/go-spnego -# github.com/git-lfs/gitobj/v2 v2.0.0 +# github.com/git-lfs/gitobj/v2 v2.0.1 github.com/git-lfs/gitobj/v2 github.com/git-lfs/gitobj/v2/errors github.com/git-lfs/gitobj/v2/pack