From 63868eca40d88a0fea5e055d0997a0dd57e8181e Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 8 Mar 2021 16:39:40 -0500 Subject: [PATCH] Merge pull request #5409 from ikomhoog/master (cherry picked from commit 82d88bdec6671fa6e89bf4e0844524799e9cbf11) Signed-off-by: Joshua M. Boniface --- CONTRIBUTORS.md | 1 + Emby.Server.Implementations/Library/PathExtensions.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 33799f24b4..d4d6579fc9 100644 --- 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) diff --git a/Emby.Server.Implementations/Library/PathExtensions.cs b/Emby.Server.Implementations/Library/PathExtensions.cs index d9e20e19ac..7dcc925c2f 100644 --- 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; }