[Libreoffice-commits] core.git: extensions/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Thu Jul 18 11:57:54 UTC 2019


 extensions/source/logging/filehandler.cxx |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 644af27d6dc02ce6c238aa76e1ff8182953946e0
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jul 18 10:04:19 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jul 18 13:56:44 2019 +0200

    cid#703953 Unchecked return value
    
    Change-Id: Id4164e0adc71e57e4c732016306bb53ae7ac4ad7
    Reviewed-on: https://gerrit.libreoffice.org/75837
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx
index 7b6331d477da..3aa0927ce54d 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -174,10 +174,12 @@ namespace logging
             m_pFile.reset( new ::osl::File( m_sFileURL ) );
             // check whether the log file already exists
             ::osl::DirectoryItem aFileItem;
-            ::osl::DirectoryItem::get( m_sFileURL, aFileItem );
-            ::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
-            if ( ::osl::FileBase::E_None == aFileItem.getFileStatus( aStatus ) )
-                ::osl::File::remove( m_sFileURL );
+            if (osl::FileBase::E_None == ::osl::DirectoryItem::get(m_sFileURL, aFileItem))
+            {
+                ::osl::FileStatus aStatus(osl_FileStatus_Mask_Validate);
+                if (::osl::FileBase::E_None == aFileItem.getFileStatus(aStatus))
+                    ::osl::File::remove(m_sFileURL);
+            }
 
             ::osl::FileBase::RC res = m_pFile->open( osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
             m_eFileValidity =   res == ::osl::FileBase::E_None


More information about the Libreoffice-commits mailing list