sal/osl/w32/file_url.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit d074556e5a62d3b0029babcb02a3b7955a9eb084 Author: Isamu Mogi <[email protected]> Date: Tue Jun 4 13:10:44 2013 +0000 fdo#41226 Add error handling of recursed GetCaseCorrectPathNameEx() This is a cherry-pick of 6d2e3bdac27ade56031d930c85e906c0d35877bc . GetCaseCorrectPathNameEx() with bCheckExistence = true doesn't support windows share path but occasionally it doesn't return failure and returns broken result. For example, when we call with "\\USER-PC\Users\foo" then it converts the path to "\Users\foo". And when "\Users\foo" exists, it returns "\Users\foo". It is caused by missing error handling of searching for file "\\USER-PC". Also similar bug possibly occurs even for local file path. This commit fixes these bugs. Change-Id: If4e390fa99f27fcc2d458bc0f2f53d83bd03719b Reviewed-on: https://gerrit.libreoffice.org/4211 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Miklos Vajna <[email protected]> diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx index fb1fa45..e9be895 100644 --- a/sal/osl/w32/file_url.cxx +++ b/sal/osl/w32/file_url.cxx @@ -486,7 +486,8 @@ static DWORD GetCaseCorrectPathNameEx( else bSkipThis = FALSE; - GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, bCheckExistence ); + if ( !GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, bCheckExistence ) ) + return 0; PathAddBackslash( lpszPath, cchBuffer ); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
