From 59db4e26d231aea5f954874b3509098699f7894c Mon Sep 17 00:00:00 2001 From: Anthony Martin Date: Sat, 22 Sep 2012 05:53:35 +1000 Subject: [PATCH] [release-branch.go1] os: avoid panic when testing errors on Plan 9 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« backport 99b8351bfb9e os: avoid panic when testing errors on Plan 9 R=golang-dev, bradfitz, akumar CC=golang-dev https://golang.org/cl/6017043 »»» --- src/pkg/os/error_plan9.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/pkg/os/error_plan9.go b/src/pkg/os/error_plan9.go index 3c9dfb0b15..f083a2d1de 100644 --- a/src/pkg/os/error_plan9.go +++ b/src/pkg/os/error_plan9.go @@ -5,6 +5,9 @@ package os func isExist(err error) bool { + if err == nil { + return false + } if pe, ok := err.(*PathError); ok { err = pe.Err } @@ -12,6 +15,9 @@ func isExist(err error) bool { } func isNotExist(err error) bool { + if err == nil { + return false + } if pe, ok := err.(*PathError); ok { err = pe.Err } @@ -19,6 +25,9 @@ func isNotExist(err error) bool { } func isPermission(err error) bool { + if err == nil { + return false + } if pe, ok := err.(*PathError); ok { err = pe.Err } -- 2.50.0