[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sw/source

[Michael Stahl]

 sw/source/core/access/accnotextframe.cxx |    2 ++
 sw/source/core/doc/docnew.cxx            |    1 +
 2 files changed, 3 insertions(+)

New commits:
commit f995ccc3d5d39f382ad278434ff0fc30de8b0ccb
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 3 12:28:42 2013 +0100

    SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrm
    
    In ~SwDoc when a SwFmt is deleted,
    SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which
    at that point was already deleted too; avoid that by returning early.
    
    This can be reproduced by closing the bugdoc from fdo#71450.
    
    Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a
    (cherry picked from commit 4c9ddd594e26c517b8515f77206bfeb2fb063e03)

diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index d0a0de9..35f969f 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -86,6 +86,8 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
          msTitle.isEmpty() )
     {
         SwAccessibleFrameBase::Modify( pOld, pNew );
+        if (!GetRegisteredIn())
+            return; // probably was deleted - avoid doing anything
     }
 
     const SwNoTxtNode *pNd = GetNoTxtNode();
commit eeca244139eec880f0eb0141243de98c3d85be9a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Dec 3 00:32:30 2013 +0100

    sw: valgrind complains about uninitialized mbIsPrepareSelAll
    
    Change-Id: I5405a6818fc63c3e29bb189858fd0abc73f67e43
    (cherry picked from commit c6f3d909f8e5c64b6bc36a13dfd0d46eb0e1d88d)

diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 5385509..b9fcfb6 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -277,6 +277,7 @@ SwDoc::SwDoc()
     mbLinksUpdated( false ), //#i38810#
     mbClipBoard( false ),
     mbColumnSelection( false ),
+    mbIsPrepareSelAll(false),
 #ifdef DBG_UTIL
     mbXMLExport(false),
 #endif