[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - svx/source

[Xisco Fauli (via logerrit)]

 svx/source/svdraw/svdotext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7903b2c1733c2ebb9f1059eb9d191befd1d36baf
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Thu Jun 27 17:26:34 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Jun 28 10:43:06 2019 +0200

    tdf#126137: Do not dereference non-existing Object
    
    Regression from dfefe448c41921f2f1e54d3f69b8b9e89031d055
    
    Use same logic as in c28ec6d9fbb21b363102faac0171de2754ea5d75
    
    Change-Id: Ia489eb61873d38c31729fedb853b11570e562123
    Reviewed-on: https://gerrit.libreoffice.org/74811
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit b653f21313f3b8ff9da99897e3a0c2df4a685b60)
    Reviewed-on: https://gerrit.libreoffice.org/74826
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 999d7fbfc57b..f042b3b9b60c 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -1049,7 +1049,7 @@ SdrTextObj& SdrTextObj::operator=(const SdrTextObj& rObj)
         {
             pNewOutlinerParaObject = pEO->CreateParaObject();
         }
-        else
+        else if (nullptr != rObj.getActiveText()->GetOutlinerParaObject())
         {
             pNewOutlinerParaObject.reset( new OutlinerParaObject(*rObj.getActiveText()->GetOutlinerParaObject()) );
         }