[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sal/osl

[Isamu Mogi]

 sal/osl/w32/file_url.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0a57644fd1ac197571c69cd3bbf67ec05c98dd74
Author: Isamu Mogi <saturday6c at gmail.com>
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: I76ef5bcaf23252d427bd85565e7daec86978cea7
    Reviewed-on: https://gerrit.libreoffice.org/4210
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 2527cbd..0eb19b3 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 );