Skip to content

Commit 6058078

Browse files
authored
Merge pull request #65 from TrumanLing/Descriptor
descriptor: size verification should be before digest calculation
2 parents 78c9ddb + 0d2a606 commit 6058078

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

image/descriptor.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ func (d *descriptor) validateContent(r io.Reader) error {
122122
return errors.Wrap(err, "error generating hash")
123123
}
124124

125+
if n != d.Size {
126+
return errors.New("size mismatch")
127+
}
128+
125129
digest := "sha256:" + hex.EncodeToString(h.Sum(nil))
126130

127131
if digest != d.Digest {
128132
return errors.New("digest mismatch")
129133
}
130134

131-
if n != d.Size {
132-
return errors.New("size mismatch")
133-
}
134-
135135
return nil
136136
}

0 commit comments

Comments
 (0)