Merge pull request #5409 from ikomhoog/master

4 years ago · 82d88bdec6
parent 90cdd1345d 02122f28cc
commit 82d88bdec6
2 changed files with 2 additions and 1 deletions
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -49,6 +49,7 @@
 - [h1nk](https://github.com/h1nk)
 - [hawken93](https://github.com/hawken93)
 - [HelloWorld017](https://github.com/HelloWorld017)
+ - [ikomhoog](https://github.com/ikomhoog)
 - [jftuga](https://github.com/jftuga)
 - [joern-h](https://github.com/joern-h)
 - [joshuaboniface](https://github.com/joshuaboniface)
--- a/Emby.Server.Implementations/Library/PathExtensions.cs
+++ b/Emby.Server.Implementations/Library/PathExtensions.cs
@ -63,7 +63,7 @@ namespace Emby.Server.Implementations.Library
        {
            newPath = null;

-            if (path.Length == 0 || subPath.Length == 0 || newSubPath.Length == 0 || subPath.Length > path.Length)
+            if (string.IsNullOrEmpty(path) || string.IsNullOrEmpty(subPath) || string.IsNullOrEmpty(newSubPath) || subPath.Length > path.Length)
            {
                return false;
            }