mirrors/git-pages
1
0
Fork 0
mirror of https://codeberg.org/git-pages/git-pages.git synced 2026-08-17 09:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tar file extractor.

Browse Source
This commit is contained in:
Catherine
2025-09-20 14:57:53 +00:00
parent 960a40d736
commit 26647411ed
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extract.go
+4 -6
View File
@@ -32,11 +32,9 @@ func ExtractTar(reader io.Reader) (*Manifest, error) {
manifestEntry := Entry{}
switch header.Typeflag {
case tar.TypeReg:
fileData := make([]byte, header.Size)
length, err := archive.Read(fileData)
if !(length == int(header.Size) && err == io.EOF) {
return nil, fmt.Errorf("tar: read: %w (expected %d bytes, read %d)",
err, header.Size, length)
fileData, err := io.ReadAll(archive)
if err != nil {
return nil, fmt.Errorf("tar: read %s: %w", fileName, err)
}
manifestEntry.Type = Type_InlineFile.Enum()
@@ -98,7 +96,7 @@ func ExtractZip(reader io.Reader) (*Manifest, error) {
fileData, err := io.ReadAll(fileReader)
if err != nil {
return nil, fmt.Errorf("zip: read: %w", err)
return nil, fmt.Errorf("zip: read %s: %w", file.Name, err)
}
manifestEntry.Type = Type_InlineFile.Enum()