alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-22 11:08:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

add some safe guards with linked children & shortcuts

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-08 13:55:37 -04:00
parent aa03e8e14a
commit 52ca9527cc
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -1020,6 +1020,11 @@ namespace MediaBrowser.Controller.Entities
/// <returns>BaseItem.</returns>
private BaseItem GetLinkedChild(LinkedChild info)
{
if (string.IsNullOrEmpty(info.Path))
{
throw new ArgumentException("Encountered linked child with empty path.");
}
var item = LibraryManager.RootFolder.FindByPath(info.Path);
if (item == null)
@@ -1070,12 +1075,21 @@ namespace MediaBrowser.Controller.Entities
try
{
Logger.Debug("Found shortcut at {0}", i.FullName);
return new LinkedChild
var resolvedPath = FileSystem.ResolveShortcut(i.FullName);
if (!string.IsNullOrEmpty(resolvedPath))
{
Path = FileSystem.ResolveShortcut(i.FullName),
Type = LinkedChildType.Shortcut
};
return new LinkedChild
{
Path = resolvedPath,
Type = LinkedChildType.Shortcut
};
}
Logger.Error("Error resolving shortcut {0}", i.FullName);
return null;
}
catch (IOException ex)
{