From: Anthony Martin <ality@pbrane.org>
Date: Fri, 21 Sep 2012 19:53:35 +0000 (+1000)
Subject: [release-branch.go1] os: avoid panic when testing errors on Plan 9
X-Git-Tag: go1.0.3~220
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=59db4e26d231aea5f954874b3509098699f7894c;p=gostls13.git

[release-branch.go1] os: avoid panic when testing errors on Plan 9

««« backport 99b8351bfb9e
os: avoid panic when testing errors on Plan 9

R=golang-dev, bradfitz, akumar
CC=golang-dev
https://golang.org/cl/6017043

»»»
---

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
 	}