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

[Caolán McNamara (via logerrit)]

 hwpfilter/source/hwpreader.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c97a3592c78ce276a353f95ce68c70a8a39174a0
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Feb 27 15:00:38 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Feb 27 18:04:14 2022 +0100

    ofz#45090 Null-dereference
    
    Change-Id: I53ec35a8fe19511429004c8a94aee1bfadb55a86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130648
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index ef40fa2ddb67..f31f1e779e60 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -2521,7 +2521,7 @@ void HwpReader::makeFStyle(FBoxStyle * fstyle)
             padd("style:horizontal-rel", sXML_CDATA, "page-content");
         }
     }
-    if( fstyle->boxtype == 'X' || fstyle->boxtype == 'B' )
+    if (fstyle->cell && (fstyle->boxtype == 'X' || fstyle->boxtype == 'B'))
     {
         Cell *cell = static_cast<Cell *>(fstyle->cell);
         if(cell->linetype[0] == cell->linetype[1] &&