RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-26 16:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

silence: fix potential panic in decodeState()

Browse Source 
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
This commit is contained in:
Simon Pasquier 2018-04-10 10:12:05 +02:00
parent a8c995f77c
commit 2d68b4d318
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
silence/silence.go
View File

@ -40,6 +40,9 @@ import (
// ErrNotFound is returned if a silence was not found.
var ErrNotFound = fmt.Errorf("not found")
// ErrInvalidState is returned if the state isn't valid.
var ErrInvalidState = fmt.Errorf("invalid state")
func utcNow() time.Time {
return time.Now().UTC()
}
@ -758,6 +761,9 @@ func decodeState(r io.Reader) (state, error) {
var s pb.MeshSilence
_, err := pbutil.ReadDelimited(r, &s)
if err == nil {
if s.Silence == nil {
return nil, ErrInvalidState
}
st[s.Silence.Id] = &s
continue
}

11
silence/silence_test.go
View File

@ -1080,3 +1080,14 @@ func TestStateCoding(t *testing.T) {
require.Equal(t, in, out, "decoded data doesn't match encoded data")
}
}
func TestStateDecodingError(t *testing.T) {
// Check whether decoding copes with erroneous data.
s := state{"": &pb.MeshSilence{}}
msg, err := s.MarshalBinary()
require.NoError(t, err)
_, err = decodeState(bytes.NewReader(msg))
require.Equal(t, ErrInvalidState, err)
}