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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/ww8par3.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ac90bb44f53e099bd8743662b20d0e5ae1752fa2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jul 15 09:53:27 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jul 15 16:19:36 2020 +0200

    ofz#24130 check level before accessing array
    
    Change-Id: Ic583ac6d8904332ae744d8e7c6639570e74a6338
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98804
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 395a1bf2e9db..5b49f98386f7 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -891,7 +891,7 @@ bool WW8ListManager::ReadLVL(SwNumFormat& rNumFormat, std::unique_ptr<SfxItemSet
         {
             sal_uInt32 nExtraOffset = 0;
             sal_uInt8 nLevelB = 0;
-            while (aLVL.aOfsNumsXCH[nLevelB] && nLevelB < nMaxLevel)
+            while (nLevelB < nMaxLevel && aLVL.aOfsNumsXCH[nLevelB])
             {
                 // Replacement symbol is read from source string from position taken from aOfsNumsXCH array
                 sal_uInt8 nOffset = aLVL.aOfsNumsXCH[nLevelB] + nExtraOffset - 1;