mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 22:19:40 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

move version check into newReader()

Browse source
This commit is contained in:
Shubheksha Jalan 2018-01-13 00:36:20 +05:30
parent faecfac2fa
commit 618bceadb4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
index/index.go
View file

@ -577,10 +577,6 @@ func NewReader(b ByteSlice, version int) (*Reader, error) {
// NewFileReader returns a new index reader against the given index file. // NewFileReader returns a new index reader against the given index file.
func NewFileReader(path string, version int) (*Reader, error) { func NewFileReader(path string, version int) (*Reader, error) {
if version != 1 && version != 2 {
return nil, errors.Errorf("unexpected file version %d", version)
}
f, err := fileutil.OpenMmapFile(path) f, err := fileutil.OpenMmapFile(path)
if err != nil { if err != nil {
return nil, err return nil, err
@ -598,6 +594,11 @@ func newReader(b ByteSlice, c io.Closer, version int) (*Reader, error) {
crc32: newCRC32(), crc32: newCRC32(),
version: version, version: version,
} }
if version != 1 && version != 2 {
return nil, errors.Errorf("unexpected file version %d", version)
}
// Verify magic number. // Verify magic number.
if b.Len() < 4 { if b.Len() < 4 {
return nil, errors.Wrap(errInvalidSize, "index header") return nil, errors.Wrap(errInvalidSize, "index header")