domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Discard unread data of git cat-file (#29297)

Browse source 
Fixes #29101
Related #29298

Discard all read data to prevent misinterpreting existing data. Some
discard calls were missing in error cases.

---------

Co-authored-by: yp05327 <576951401@qq.com>
(cherry picked from commit d6811baf88ca6d58b92d4dc12b1f2a292198751f)
This commit is contained in:
KN4CK3R 2024-02-22 04:48:19 +01:00 • committed by Earl Warren
parent 3591d9bff9
commit 9debff3b71
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
10 changed files with 66 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/git/tree_nogogit.go
View file

@ -7,7 +7,6 @@ package git
import (
"io"
"math"
"strings"
)
@ -63,19 +62,8 @@ func (t *Tree) ListEntries() (Entries, error) {
}
// Not a tree just use ls-tree instead
for sz > math.MaxInt32 {
discarded, err := rd.Discard(math.MaxInt32)
sz -= int64(discarded)
if err != nil {
return nil, err
}
}
for sz > 0 {
discarded, err := rd.Discard(int(sz))
sz -= int64(discarded)
if err != nil {
return nil, err
}
if err := DiscardFull(rd, sz+1); err != nil {
return nil, err
}
}