[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 6905434f40a1b3a58955b3b444d69f239be1b14e
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Apr 4 09:08:52 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Apr 4 11:43:57 2022 +0200

    ofz#46331 Null-dereference READ
    
    Change-Id: Id03c7fc437d67e01d6a1ec0547b2584396066201
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132497
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 8c84970867ba..7ab6689f8df3 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -4442,7 +4442,7 @@ void HwpReader::makeHidden(Hidden * hbox)
 
     while (para)
     {
-        for (int n = 0; n < para->nch && para->hhstr[n]->hh;
+        for (int n = 0; n < para->nch && para->hhstr.count(n) && 
para->hhstr[n]->hh;
             n += para->hhstr[n]->WSize())
         {
               res = hcharconv(para->hhstr[n]->hh, dest, UNICODE);