mirror of
https://github.com/golang/go
synced 2024-11-25 04:57:56 -07:00
gofmt -r: match(...) arguments may be nil; add missing guards
Fixes #1446. R=rsc CC=golang-dev https://golang.org/cl/3981043
This commit is contained in:
parent
9ec785af2f
commit
32a7e46488
@ -124,9 +124,9 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
|
||||
// Wildcard matches any expression. If it appears multiple
|
||||
// times in the pattern, it must match the same expression
|
||||
// each time.
|
||||
if m != nil && pattern.Type() == identType {
|
||||
if m != nil && pattern != nil && pattern.Type() == identType {
|
||||
name := pattern.Interface().(*ast.Ident).Name
|
||||
if isWildcard(name) {
|
||||
if isWildcard(name) && val != nil {
|
||||
// wildcards only match expressions
|
||||
if _, ok := val.Interface().(ast.Expr); ok {
|
||||
if old, ok := m[name]; ok {
|
||||
|
Loading…
Reference in New Issue
Block a user