[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 ef37fa084e55aa13ecebcd0ebdbc7c2bca908c11
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Mar 19 14:39:30 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Mar 19 20:09:53 2022 +0100

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

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 13e60e21590d..8c84970867ba 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3570,7 +3570,7 @@ void HwpReader::makeFormula(TxtBox * hbox)
     pPar = hbox->plists[0].empty() ? nullptr : hbox->plists[0].front().get();
     while( pPar )
     {
-        for( n = 0; n < pPar->nch && pPar->hhstr[n]->hh;
+        for( n = 0; n < pPar->nch && pPar->hhstr.count(n) && 
pPar->hhstr[n]->hh;
             n += pPar->hhstr[n]->WSize() )
         {
             if (l >= sizeof(mybuf)-7)