[Libreoffice-commits] core.git: Branch 'libreoffice-7-6-1' - comphelper/source

[Noel Grandin (via logerrit)]

 comphelper/source/eventattachermgr/eventattachermgr.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 280380751563c9bd654236f04cedfb855f0903f7
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Aug 31 14:01:17 2023 +0200
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Sep 6 14:34:35 2023 +0200

    tdf#156967 cal basic, CSV import macro crashes
    
    regression from
        commit ba4191ff0de05334ba32b53a09ad992710f03f9d
        Author: Noel Grandin <noelgran...@gmail.com>
        Date:   Mon Jan 30 21:48:53 2023 +0200
        osl::Mutex->std::mutex in ImplEventAttacherManager
    
    Change-Id: I1557d9b6f66628fae1f466198ac4a8961e85e5bb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156337
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    (cherry picked from commit b9d9f9ee71464425a52c5798503840b106b210bc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156375
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    (cherry picked from commit f8ad030f5ffe4b11be09dd13c356d9942b18ecc9)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156386
    Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
    Reviewed-by: Hossein <hoss...@libreoffice.org>
    Tested-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx 
b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 260121ba1517..50085c5ce6e4 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -252,7 +252,10 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( 
const AllEventObject& Even
     OInterfaceIteratorHelper4 aIt( l, mxManager->aScriptListeners );
     while( aIt.hasMoreElements() )
     {
+        // cannot hold lock over call to approveFiring, since it might recurse 
back into us
+        l.unlock();
         aRet = aIt.next()->approveFiring( aScriptEvent );
+        l.lock();
         try
         {
             Reference< XIdlClass > xListenerType = 
mxManager->getReflection(l)->