]> Cypherpunks repositories - gostls13.git/commitdiff
go/cmd, crypto/x509, net/textproto, html/template: fix minor issues with nil values
authorMarat Khabibullin <marat.khabibullin@jetbrains.com>
Fri, 15 Feb 2019 13:22:36 +0000 (13:22 +0000)
committerIan Lance Taylor <iant@golang.org>
Fri, 8 Mar 2019 13:24:07 +0000 (13:24 +0000)
Remove redundant checks for nil value, add missing nil checks to prevent tests from failing with 'nil pointer dereference'.

Fixes #30208.

Change-Id: I59091ba4014afcb5300567fd7e73fea43c6bb2ee
GitHub-Last-Rev: 20501470bbb8ad8fd60f6f87b4594ab64fcfdff1
GitHub-Pull-Request: golang/go#30226
Reviewed-on: https://go-review.googlesource.com/c/go/+/162657
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/cmd/go/internal/work/exec.go

index 3a7d3fe76780c80ce0e9fdde28308a3e4e0090d9..62ae01e5551250d06c1ad7571607fbe351679207 100644 (file)
@@ -104,9 +104,7 @@ func (b *Builder) Do(root *Action) {
                var err error
 
                if a.Func != nil && (!a.Failed || a.IgnoreFail) {
-                       if err == nil {
-                               err = a.Func(b, a)
-                       }
+                       err = a.Func(b, a)
                }
 
                // The actions run in parallel but all the updates to the