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

[Caolán McNamara (via logerrit)]

 sw/source/core/text/pormulti.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 00904f994a2f03638ec7f284396aeb730746e68d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Oct 16 17:01:59 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Oct 16 20:11:36 2023 +0200

    ofz#63295 Null-dereference READ
    
    Change-Id: Ib8bfa814099c1c1f3d65b18026ea812c80b6e9c9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158058
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sw/source/core/text/pormulti.cxx b/sw/source/core/text/pormulti.cxx
index 2067adcfc155..7a2e8c44c653 100644
--- a/sw/source/core/text/pormulti.cxx
+++ b/sw/source/core/text/pormulti.cxx
@@ -2505,7 +2505,7 @@ SwLinePortion* SwTextFormatter::MakeRestPortion( const 
SwLineLayout* pLine,
             pTmp = new SwDoubleLinePortion( *pCreate, nMultiPos );
         else if( pHelpMulti->IsBidi() )
             pTmp = new SwBidiPortion( nMultiPos, pCreate->nLevel );
-        else if (IsIncompleteRuby(*pHelpMulti))
+        else if (IsIncompleteRuby(*pHelpMulti) && pCreate->pAttr)
         {
             TextFrameIndex nRubyOffset = static_cast<const 
SwRubyPortion*>(pHelpMulti)->GetRubyOffset();
             pTmp = new SwRubyPortion( *pCreate, *GetInfo().GetFont(),