]> Cypherpunks repositories - gostls13.git/commitdiff
internal/safefilepath: fix TestFromFS on Plan 9
authorDavid du Colombier <0intro@gmail.com>
Wed, 7 Dec 2022 14:20:25 +0000 (15:20 +0100)
committerDavid du Colombier <0intro@gmail.com>
Wed, 7 Dec 2022 23:52:46 +0000 (23:52 +0000)
CL 455716 added TestFromFS. This test was failing on Plan 9
because fromFS didn't return an empty string in case of error.

This change fixes TestFromFS by returning an empty string
in case of error.

Fixes #57142.

Change-Id: Ie50dfba5e70154d641f762fa43f1c26c3d12b6f6
Reviewed-on: https://go-review.googlesource.com/c/go/+/455835
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
Run-TryBot: David du Colombier <0intro@gmail.com>

src/internal/safefilepath/path_other.go

index f93da18680d01c1fc30b8613183905acc20efac1..974e7751a290e682487a89ef1a0e2d963d148928 100644 (file)
@@ -11,7 +11,7 @@ import "runtime"
 func fromFS(path string) (string, error) {
        if runtime.GOOS == "plan9" {
                if len(path) > 0 && path[0] == '#' {
-                       return path, errInvalidPath
+                       return "", errInvalidPath
                }
        }
        for i := range path {