[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - basic/source

[Caolán McNamara]

 basic/source/sbx/sbxvar.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit c3d625af537dcb5ca380b7fb30345d0cbd90e4b1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 9 14:11:07 2014 +0000

    Resolves: fdo#86843 avoid getting deleted before finishing Broadcast
    
    Change-Id: I19181f9e2fbd5f906e6e5d807b1b2483e7881cf0
    (cherry picked from commit 19d0950451f909086c3732ce29812c4cda513908)
    Reviewed-on: https://gerrit.libreoffice.org/13420
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index c0de91f..88997cc 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -166,6 +166,11 @@ void SbxVariable::Broadcast( sal_uIntPtr nHintId )
                 return;
             }
         }
+
+        //fdo#86843 Add a ref during the following block to guard against
+        //getting deleted before completing this method
+        SbxVariableRef aBroadcastGuard(this);
+
         // Avoid further broadcasting
         SfxBroadcaster* pSave = pCst;
         pCst = NULL;