qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 07:24:47 -07:00
Code Releases Activity

gofmt -r: match(...) arguments may be nil; add missing guards

Browse Source 
Fixes #1446.

R=rsc
CC=golang-dev
https://golang.org/cl/3981043
This commit is contained in:
Robert Griesemer 2011-01-26 19:17:53 -08:00
parent 9ec785af2f
commit 32a7e46488
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/gofmt/rewrite.go
View File

@ -124,9 +124,9 @@ func match(m map[string]reflect.Value, pattern, val reflect.Value) bool {
// Wildcard matches any expression. If it appears multiple // Wildcard matches any expression. If it appears multiple
// times in the pattern, it must match the same expression // times in the pattern, it must match the same expression
// each time. // each time.
if m != nil && pattern.Type() == identType { if m != nil && pattern != nil && pattern.Type() == identType {
name := pattern.Interface().(*ast.Ident).Name name := pattern.Interface().(*ast.Ident).Name
if isWildcard(name) { if isWildcard(name) && val != nil {
// wildcards only match expressions // wildcards only match expressions
if _, ok := val.Interface().(ast.Expr); ok { if _, ok := val.Interface().(ast.Expr); ok {
if old, ok := m[name]; ok { if old, ok := m[name]; ok {