[Libreoffice-commits] core.git: sal/osl

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Sep 1 15:45:37 UTC 2019


 sal/osl/unx/file_misc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5a098fea05fd32d8473730bbf7d35c36540c9df3
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 1 15:52:23 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Sep 1 17:45:02 2019 +0200

    Resolves: ofz#16898 Direct-leak in rtl_uString_ImplAlloc
    
    Change-Id: I7bc11108790f8d87396bad3a2c5c2280f8f7d59a
    Reviewed-on: https://gerrit.libreoffice.org/78369
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sal/osl/unx/file_misc.cxx b/sal/osl/unx/file_misc.cxx
index 880ed3045e32..878d966b34d0 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -182,7 +182,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
                     {
                         pDirImpl->eKind = DirectoryImpl::KIND_ASSETS;
                         pDirImpl->pApkDirStruct = pdir;
-                        pDirImpl->ustrPath = OUString::unacquired(&ustrSystemPath);
+                        pDirImpl->ustrPath = OUString(ustrSystemPath, SAL_NO_ACQUIRE);
 
                         *pDirectory = (oslDirectory) pDirImpl;
                         return osl_File_E_None;
@@ -210,7 +210,7 @@ oslFileError SAL_CALL osl_openDirectory(rtl_uString* ustrDirectoryURL, oslDirect
                 if( pDirImpl )
                 {
                     pDirImpl->pDirStruct = pdir;
-                    pDirImpl->ustrPath = OUString::unacquired(&ustrSystemPath);
+                    pDirImpl->ustrPath = OUString(ustrSystemPath, SAL_NO_ACQUIRE);
 #ifdef ANDROID
                     pDirImpl->eKind = DirectoryImpl::KIND_DIRENT;
 #endif


More information about the Libreoffice-commits mailing list