Merge 9e3a313 into ac2a90d

jbohunovsky-IDG · web-flow · commit c9bb0486772b · 2025-02-17T10:27:08.000Z
diff --git a/CefSharp/SchemeHandler/FolderSchemeHandlerFactory.cs b/CefSharp/SchemeHandler/FolderSchemeHandlerFactory.cs
@@ -109,7 +109,7 @@ protected virtual IResourceHandler Create(IBrowser browser, IFrame frame, string
                 asbolutePath = defaultPage;
             }
 
-            var filePath = WebUtility.UrlDecode(Path.GetFullPath(Path.Combine(rootFolder, asbolutePath)));
+            var filePath = Path.GetFullPath(Path.Combine(rootFolder, WebUtility.UrlDecode(asbolutePath)));
 
             //Check the file requested is within the specified path and that the file exists
             if (filePath.StartsWith(rootFolder, StringComparison.OrdinalIgnoreCase) && File.Exists(filePath))

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ protected virtual IResourceHandler Create(IBrowser browser, IFrame frame, string`
`109`	`109`	`asbolutePath = defaultPage;`
`110`	`110`	`}`
`111`	`111`
`112`		`- var filePath = WebUtility.UrlDecode(Path.GetFullPath(Path.Combine(rootFolder, asbolutePath)));`
	`112`	`+ var filePath = Path.GetFullPath(Path.Combine(rootFolder, WebUtility.UrlDecode(asbolutePath)));`
`113`	`113`
`114`	`114`	`//Check the file requested is within the specified path and that the file exists`
`115`	`115`	`if (filePath.StartsWith(rootFolder, StringComparison.OrdinalIgnoreCase) && File.Exists(filePath))`