Skip to content

Commit a7cb2c8

Browse files
committed
pattern matcher: test membership, not nil
1 parent ff48987 commit a7cb2c8

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

dnscrypt-proxy/pattern_matcher.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,10 @@ func (patternMatcher *PatternMatcher) Add(pattern string, val any, position int)
102102
switch patternType {
103103
case PatternTypeSubstring:
104104
patternMatcher.substrings = append(patternMatcher.substrings, pattern)
105-
if val != nil {
106-
patternMatcher.indirectVals[pattern] = val
107-
}
105+
patternMatcher.indirectVals[pattern] = val
108106
case PatternTypePattern:
109107
patternMatcher.patterns = append(patternMatcher.patterns, pattern)
110-
if val != nil {
111-
patternMatcher.indirectVals[pattern] = val
112-
}
108+
patternMatcher.indirectVals[pattern] = val
113109
case PatternTypePrefix:
114110
patternMatcher.prefixes.Insert([]byte(pattern), val)
115111
case PatternTypeSuffix:
@@ -127,7 +123,7 @@ func (patternMatcher *PatternMatcher) Eval(qName string) (reject bool, reason st
127123
return false, "", nil
128124
}
129125

130-
if xval := patternMatcher.exact[qName]; xval != nil {
126+
if xval, found := patternMatcher.exact[qName]; found {
131127
return true, qName, xval
132128
}
133129

0 commit comments

Comments
 (0)