mirror of
https://github.com/containers/skopeo.git
synced 2025-09-27 13:13:52 +00:00
Bump github.com/containers/storage from 1.15.2 to 1.15.3
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.15.2 to 1.15.3. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.15.2...v1.15.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
committed by
Valentin Rothberg
parent
c3e6b4f917
commit
17b921cbbc
9
vendor/github.com/containers/storage/drivers/overlay/overlay.go
generated
vendored
9
vendor/github.com/containers/storage/drivers/overlay/overlay.go
generated
vendored
@@ -676,9 +676,6 @@ func (d *Driver) getLower(parent string) (string, error) {
|
||||
parentLowers := strings.Split(string(parentLower), ":")
|
||||
lowers = append(lowers, parentLowers...)
|
||||
}
|
||||
if len(lowers) > maxDepth {
|
||||
return "", errors.New("max depth exceeded")
|
||||
}
|
||||
return strings.Join(lowers, ":"), nil
|
||||
}
|
||||
|
||||
@@ -828,6 +825,10 @@ func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountO
|
||||
if err != nil && !os.IsNotExist(err) {
|
||||
return "", err
|
||||
}
|
||||
splitLowers := strings.Split(string(lowers), ":")
|
||||
if len(splitLowers) > maxDepth {
|
||||
return "", errors.New("max depth exceeded")
|
||||
}
|
||||
|
||||
// absLowers is the list of lowers as absolute paths, which works well with additional stores.
|
||||
absLowers := []string{}
|
||||
@@ -851,7 +852,7 @@ func (d *Driver) get(id string, disableShifting bool, options graphdriver.MountO
|
||||
|
||||
// For each lower, resolve its path, and append it and any additional diffN
|
||||
// directories to the lowers list.
|
||||
for _, l := range strings.Split(string(lowers), ":") {
|
||||
for _, l := range splitLowers {
|
||||
if l == "" {
|
||||
continue
|
||||
}
|
||||
|
Reference in New Issue
Block a user