Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2026-05-08 20:58:48 +02:00
Code Issues Projects Releases Wiki Activity

Fix panic when library path has trailing path separator (#6619)

Browse source 
* Replace panic with warning if creating a folder hierarchy where parent is equal to current
* Clean stash paths so that comparison works correctly when creating folder hierarchies
This commit is contained in:
WithoutPants 2026-02-28 10:51:02 +11:00 committed by GitHub
parent 3b8f6bd94c
commit c7e1c3da69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/manager/config/stash_config.go
View file

@ -42,7 +42,8 @@ func (s StashConfigs) GetStashFromDirPath(dirPath string) *StashConfig {
func (s StashConfigs) Paths() []string { func (s StashConfigs) Paths() []string {
paths := make([]string, len(s)) paths := make([]string, len(s))
for i, c := range s { for i, c := range s {
paths[i] = c.Path // #6618 - clean the path to ensure comparison works correctly
paths[i] = filepath.Clean(c.Path)
} }
return paths return paths
} }

5
pkg/file/folder.go
View file

@ -33,7 +33,10 @@ func GetOrCreateFolderHierarchy(ctx context.Context, fc models.FolderFinderCreat
// safety check - don't allow parent path to be the same as the current path, // safety check - don't allow parent path to be the same as the current path,
// otherwise we could end up in an infinite loop // otherwise we could end up in an infinite loop
if parentPath == path { if parentPath == path {
panic(fmt.Sprintf("parent path is the same as the current path: %s", path)) // #6618 - log a warning and return nil for the parent ID,
// which will cause the folder to be created with no parent
logger.Warnf("parent path is the same as the current path: %s", path)
return nil, nil
} }
parent, err := GetOrCreateFolderHierarchy(ctx, fc, parentPath, rootPaths) parent, err := GetOrCreateFolderHierarchy(ctx, fc, parentPath, rootPaths)