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

[Caolán McNamara (via logerrit)]

 sal/osl/unx/file_misc.cxx    |    1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit 2f3d8e05a3ed4421fc987c3d096cadb636056104
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 9 09:25:00 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 9 12:43:18 2019 +0200

    remove still pending timeout in dtor
    
    Change-Id: I8ec8c62a9cd5349fa6e58c2d0515bd57edede97a
    Reviewed-on: https://gerrit.libreoffice.org/80523
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8cd3379f7af1..eacb188ebee8 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5779,6 +5779,8 @@ public:
 
     virtual ~GtkInstanceNotebook() override
     {
+        if (m_nLaunchSplitTimeoutId)
+            g_source_remove(m_nLaunchSplitTimeoutId);
         if (m_nSizeAllocateSignalId)
             g_signal_handler_disconnect(m_pNotebook, m_nSizeAllocateSignalId);
         g_signal_handler_disconnect(m_pNotebook, m_nSwitchPageSignalId);
commit 0e7bbc0427c95823fc4e2fafd37a7735c84f3b0b
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 9 09:05:11 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Oct 9 12:42:53 2019 +0200

    cid#1453854 silence Time of check time of use
    
    Change-Id: Icfa358476db3166c29e893c09ec943aa3c38dba3
    Reviewed-on: https://gerrit.libreoffice.org/80520
    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 4e33e06da0ae..67ba37f6f7e1 100644
--- a/sal/osl/unx/file_misc.cxx
+++ b/sal/osl/unx/file_misc.cxx
@@ -623,6 +623,7 @@ oslFileError SAL_CALL osl_replaceFile(rtl_uString* ustrFileURL, rtl_uString* ust
     if (eRet == osl_File_E_None)
     {
         struct stat aFileStat;
+        // coverity[fs_check_call] - unavoidable TOCTOU
         int nRet = stat(destPath, &aFileStat);
         if (nRet == -1)
         {