[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 f6f665200c3ac6d046194ea25535c25d00717378
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 7 09:05:33 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Mar 7 10:53:25 2022 +0100

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

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index a20d71b5c5c3..c0feb4f5b61d 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3696,7 +3696,7 @@ void HwpReader::makePicture(Picture * hbox)
                     OUString::number(WTMM( hbox->box_ys + 
hbox->style.margin[1][2] + hbox->style.margin[1][3] + hbox->cap_ys )) + "mm");
                 startEl("draw:text-box");
                 mxList->clear();
-                if( hbox->cap_pos % 2 )           /* Caption is on the top */
+                if (!hbox->caption.empty() && hbox->cap_pos % 2)           /* 
Caption is on the top */
                 {
                     parsePara(hbox->caption.front().get());
                 }