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

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

View file

@ -121,8 +121,7 @@ func (repo *Repository) getCommitFromBatchReader(rd *bufio.Reader, id SHA1) (*Co
return commit, nil
default:
log.Debug("Unknown typ: %s", typ)
_, err = rd.Discard(int(size) + 1)
if err != nil {
if err := DiscardFull(rd, size+1); err != nil {
return nil, err
}
return nil, ErrNotExist{