diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-25 21:40:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 21:40:38 +0200 |
| commit | 5b7086abda91f4301af3bfb642d416a22349c276 (patch) | |
| tree | bf139f29b261e55c161394637f1c7073da5103f0 /vendor/github.com/cyphar/filepath-securejoin | |
| parent | a488e197a6e3947dd420b40ed834b50db9c829c3 (diff) | |
| parent | 2388222e98462fdbbe44f3e091b2b79d80956a9a (diff) | |
| download | podman-5b7086abda91f4301af3bfb642d416a22349c276.tar.gz podman-5b7086abda91f4301af3bfb642d416a22349c276.tar.bz2 podman-5b7086abda91f4301af3bfb642d416a22349c276.zip | |
Merge pull request #3418 from vrothberg/go-modules
update dependencies
Diffstat (limited to 'vendor/github.com/cyphar/filepath-securejoin')
| -rw-r--r-- | vendor/github.com/cyphar/filepath-securejoin/VERSION | 2 | ||||
| -rw-r--r-- | vendor/github.com/cyphar/filepath-securejoin/join.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/cyphar/filepath-securejoin/VERSION b/vendor/github.com/cyphar/filepath-securejoin/VERSION index 0c62199f1..ee1372d33 100644 --- a/vendor/github.com/cyphar/filepath-securejoin/VERSION +++ b/vendor/github.com/cyphar/filepath-securejoin/VERSION @@ -1 +1 @@ -0.2.1 +0.2.2 diff --git a/vendor/github.com/cyphar/filepath-securejoin/join.go b/vendor/github.com/cyphar/filepath-securejoin/join.go index f20985479..c4ca3d713 100644 --- a/vendor/github.com/cyphar/filepath-securejoin/join.go +++ b/vendor/github.com/cyphar/filepath-securejoin/join.go @@ -12,7 +12,6 @@ package securejoin import ( "bytes" - "fmt" "os" "path/filepath" "strings" @@ -23,7 +22,7 @@ import ( // ErrSymlinkLoop is returned by SecureJoinVFS when too many symlinks have been // evaluated in attempting to securely join the two given paths. -var ErrSymlinkLoop = fmt.Errorf("SecureJoin: too many links") +var ErrSymlinkLoop = errors.Wrap(syscall.ELOOP, "secure join") // IsNotExist tells you if err is an error that implies that either the path // accessed does not exist (or path components don't exist). This is |