Skip to content
This repository has been archived by the owner on Jun 27, 2023. It is now read-only.

Avoid modifying passed in slice of cids #65

Merged
merged 2 commits into from
Jun 24, 2020
Merged

Avoid modifying passed in slice of cids #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a978cec
Avoid modifying passed in slice of cids
Jun 24, 2020
5ca73b9
Use append instead of index assign
Kubuxu Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions blockservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,26 @@ func getBlocks(ctx context.Context, ks []cid.Cid, bs blockstore.Blockstore, fget
go func() {
defer close(out)

k := 0
allValid := true
for _, c := range ks {
// hash security
if err := verifcid.ValidateCid(c); err == nil {
ks[k] = c
k++
} else {
log.Errorf("unsafe CID (%s) passed to blockService.GetBlocks: %s", c, err)
if err := verifcid.ValidateCid(c); err != nil {
allValid = false
break
}
}
ks = ks[:k]

if !allValid {
ks2 := make([]cid.Cid, 0, len(ks))
for _, c := range ks {
// hash security
if err := verifcid.ValidateCid(c); err == nil {
ks2 = append(ks2, c)
} else {
log.Errorf("unsafe CID (%s) passed to blockService.GetBlocks: %s", c, err)
}
}
ks = ks2
}

var misses []cid.Cid
for _, c := range ks {
Expand Down