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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdedxv.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7a52e06ea062549d385270b368d549c92fbad841
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Nov 2 20:09:56 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Nov 2 22:14:44 2021 +0100

    cid#1493241 Wrapper object use after free
    
    unclear if this is the right fix here
    
    Change-Id: I6910ff405c2acb03fadd8e751e971d9b010b7d52
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124620
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 3717fdce2c08..c10d8573c1bd 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1473,6 +1473,9 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool 
bDontDeleteReally)
                 delete pOriginal;
             }
 
+            // cid#1493241 - Wrapper object use after free
+            if (pUndoEditUndoManager == mpLocalTextEditUndoManager.get())
+                pUndoEditUndoManager = nullptr;
             mpLocalTextEditUndoManager.reset();
         }
     }