Merge 0a258b3 into 066f5a9

James Coyle · web-flow · commit 14d6afe32738 · 2018-04-17T09:46:07.000Z
diff --git a/CefSharp/SchemeHandler/FolderSchemeHandlerFactory.cs b/CefSharp/SchemeHandler/FolderSchemeHandlerFactory.cs
@@ -80,7 +80,7 @@ IResourceHandler ISchemeHandlerFactory.Create(IBrowser browser, IFrame frame, st
                 asbolutePath = defaultPage;
             }
 
-            var filePath = Path.GetFullPath(Path.Combine(rootFolder, asbolutePath));
+            var filePath = WebUtility.UrlDecode(Path.GetFullPath(Path.Combine(rootFolder, 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
`@@ -80,7 +80,7 @@ IResourceHandler ISchemeHandlerFactory.Create(IBrowser browser, IFrame frame, st`
`80`	`80`	`asbolutePath = defaultPage;`
`81`	`81`	`}`
`82`	`82`
`83`		`- var filePath = Path.GetFullPath(Path.Combine(rootFolder, asbolutePath));`
	`83`	`+ var filePath = WebUtility.UrlDecode(Path.GetFullPath(Path.Combine(rootFolder, asbolutePath)));`
`84`	`84`
`85`	`85`	`//Check the file requested is within the specified path and that the file exists`
`86`	`86`	`if(filePath.StartsWith(rootFolder, StringComparison.OrdinalIgnoreCase) && File.Exists(filePath))`