nune/gitea
nune/gitea
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Backport #29297 by @KN4CK3R

Fixes #29101
Related #29298

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

Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: yp05327 <576951401@qq.com>
This commit is contained in:
Giteabot 2024-02-22 12:23:38 +08:00 • committed by GitHub
parent 0870e0bc9b
commit ed5e0c8c27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 66 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/git/commit_info_nogogit.go
View file

@ -151,6 +151,9 @@ func GetLastCommitForPaths(ctx context.Context, commit *Commit, treePath string,
return nil, err
}
if typ != "commit" {
if err := DiscardFull(batchReader, size+1); err != nil {
return nil, err
}
return nil, fmt.Errorf("unexpected type: %s for commit id: %s", typ, commitID)
}
c, err = CommitFromReader(commit.repo, MustIDFromString(commitID), io.LimitReader(batchReader, size))