mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-09-19 23:37:31 -07:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix missing bound checks, off-by-ones, typos

Browse source
This commit is contained in:
Fabian Reinartz 2016-12-15 11:24:20 +01:00
parent 5424a0cf75
commit 9ceed5378e
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
block.go
View file

@ -90,9 +90,11 @@ func findPersistedBlocks(path string) ([]*persistedBlock, error) {
}
for _, fi := range files {
pb, err := newPersistedBlock(fi.Name())
p := filepath.Join(path, fi.Name())
pb, err := newPersistedBlock(p)
if err != nil {
return nil, fmt.Errorf("error initializing block %q: %s", fi.Name(), err)
return nil, fmt.Errorf("error initializing block %q: %s", p, err)
}
pbs = append(pbs, pb)
}

16
reader.go
View file

@ -129,8 +129,13 @@ func readHashmap(flag byte, b []byte, err error) (map[string]uint32, error) {
if n < 1 {
return nil, errInvalidSize
}
s := string(b[n : n+int(l)])
b = b[n+int(l):]
b = b[n:]
if len(b) < int(l) {
return nil, errInvalidSize
}
s := string(b[:l])
b = b[l:]
o, n := binary.Uvarint(b)
if n < 1 {
@ -151,15 +156,16 @@ func (r *indexReader) section(o uint32) (byte, []byte, error) {
return 0, nil, errInvalidSize
}
flag := r.b[0]
flag := b[0]
l := binary.BigEndian.Uint32(b[1:5])
b = b[5:]
if len(b) < int(l) {
// b must have the given length plus 4 bytes for the CRC32 checksum.
if len(b) < int(l)+4 {
return 0, nil, errInvalidSize
}
return flag, b, nil
return flag, b[:l], nil
}
func (r *indexReader) lookupSymbol(o uint32) ([]byte, error) {

17
writer.go
View file

@ -196,11 +196,10 @@ type indexWriter struct {
func newIndexWriter(w io.Writer) *indexWriter {
return &indexWriter{
w: w,
n: 0,
symbols: make(map[string]uint32, 4096),
series: make(map[uint32]*indexWriterSeries, 4096),
labelIndexes: make([]hashEntry, 10),
w: w,
n: 0,
symbols: make(map[string]uint32, 4096),
series: make(map[uint32]*indexWriterSeries, 4096),
}
}
@ -212,12 +211,10 @@ func (w *indexWriter) write(wr io.Writer, b []byte) error {
// section writes a CRC32 checksummed section of length l and guarded by flag.
func (w *indexWriter) section(l uint32, flag byte, f func(w io.Writer) error) error {
l++ // account for flag byte
h := crc32.NewIEEE()
wr := io.MultiWriter(h, w.w)
b := [5]byte{flagStd, 0, 0, 0, 0}
b := [5]byte{flag, 0, 0, 0, 0}
binary.BigEndian.PutUint32(b[1:], l)
if err := w.write(wr, b[:]); err != nil {
@ -357,7 +354,7 @@ func (w *indexWriter) WriteLabelIndex(names []string, values []string) error {
for _, v := range valt.s {
binary.BigEndian.PutUint32(buf, w.symbols[v])
if err := w.write(wr, buf); err != nil {
if err := w.write(wr, buf[:4]); err != nil {
return err
}
}
@ -410,7 +407,7 @@ func (w *indexWriter) writeHashmap(h []hashEntry) error {
b = append(b, buf[:n]...)
}
return w.section(uint32(len(buf)), flagStd, func(wr io.Writer) error {
return w.section(uint32(len(b)), flagStd, func(wr io.Writer) error {
return w.write(wr, b)
})
}