mirror of
https://github.com/prometheus/prometheus.git
synced 2025-03-05 20:59:13 -08:00
Ensure manipulating the returned FastRegexMatcher.SetMatches() doesn't pollute the matcher's internal state
Signed-off-by: Marco Pracucci <marco@pracucci.com>
This commit is contained in:
parent
e239c5eda5
commit
986ca1a16a
|
@ -339,7 +339,13 @@ func (m *FastRegexMatcher) MatchString(s string) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *FastRegexMatcher) SetMatches() []string {
|
func (m *FastRegexMatcher) SetMatches() []string {
|
||||||
return m.setMatches
|
// IMPORTANT: always return a copy, otherwise if the caller manipulate this slice it will
|
||||||
|
// also get manipulated in the cached FastRegexMatcher instance.
|
||||||
|
ret := make([]string, 0, len(m.setMatches))
|
||||||
|
for _, value := range m.setMatches {
|
||||||
|
ret = append(ret, value)
|
||||||
|
}
|
||||||
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *FastRegexMatcher) GetRegexString() string {
|
func (m *FastRegexMatcher) GetRegexString() string {
|
||||||
|
|
|
@ -344,6 +344,20 @@ func TestFindSetMatches(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestFastRegexMatcher_SetMatches_ShouldReturnACopy(t *testing.T) {
|
||||||
|
m, err := newFastRegexMatcherWithoutCache("a|b")
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, []string{"a", "b"}, m.SetMatches())
|
||||||
|
|
||||||
|
// Manipulate the returned slice.
|
||||||
|
matches := m.SetMatches()
|
||||||
|
matches[0] = "xxx"
|
||||||
|
matches[1] = "yyy"
|
||||||
|
|
||||||
|
// Ensure that if we call SetMatches() again we get the original one.
|
||||||
|
require.Equal(t, []string{"a", "b"}, m.SetMatches())
|
||||||
|
}
|
||||||
|
|
||||||
func BenchmarkFastRegexMatcher(b *testing.B) {
|
func BenchmarkFastRegexMatcher(b *testing.B) {
|
||||||
texts := generateRandomValues()
|
texts := generateRandomValues()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue