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

Caolán McNamara caolanm at redhat.com
Fri Nov 24 11:15:30 UTC 2017


 vcl/source/app/scheduler.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 793b69fe73eb2d6ae4c42f04a66df8c180e42886
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 24 10:01:32 2017 +0000

    don't worry about dangling timers at fuzzer exit
    
    Change-Id: I9e18257f7e6e0438c6ce2801c0c2f8885b060870
    Reviewed-on: https://gerrit.libreoffice.org/45214
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 8fd26ec79a55..2ef3c87d83f8 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -23,6 +23,7 @@
 
 #include <svdata.hxx>
 #include <tools/time.hxx>
+#include <unotools/configmgr.hxx>
 #include <vcl/scheduler.hxx>
 #include <vcl/idle.hxx>
 #include <saltimer.hxx>
@@ -575,7 +576,7 @@ Task::~Task() COVERITY_NOEXCEPT_FALSE
             mpSchedulerData->mpTask = nullptr;
     }
     else
-        assert( nullptr == mpSchedulerData );
+        assert(nullptr == mpSchedulerData || utl::ConfigManager::IsFuzzing());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list