TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 6 Projects Releases 1 Activity Actions

adm: Check for error when reading contracts from archive #1165

Merged
fyrchik merged 1 commit from acid-ant/frostfs-node:bugfix/951-revise-contracts into master 2024-06-07 12:09:18 +00:00
Conversation 0 Commits 1 Files changed 1 +7 -4
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/frostfs-adm/internal/modules/morph/helper/util.go
View file

@ -122,11 +122,11 @@ func readContractsFromArchive(file io.Reader, names []string) (map[string]*Contr
} }
r := tar.NewReader(gr) r := tar.NewReader(gr)
for h, err := r.Next(); ; h, err = r.Next() { var h *tar.Header
if err != nil { for h, err = r.Next(); err == nil && h != nil; h, err = r.Next() {
break if h.Typeflag != tar.TypeReg {
continue
} }
dir, _ := filepath.Split(h.Name) dir, _ := filepath.Split(h.Name)
ctrName := filepath.Base(dir) ctrName := filepath.Base(dir)
@ -149,6 +149,9 @@ func readContractsFromArchive(file io.Reader, names []string) (map[string]*Contr
} }
m[ctrName] = cs m[ctrName] = cs
} }
if err != nil && err != io.EOF {
return nil, fmt.Errorf("can't read contracts from archive: %w", err)
}
for ctrName, cs := range m { for ctrName, cs := range m {
if cs.RawNEF == nil { if cs.RawNEF == nil {