[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - hwpfilter/source

[Caolán McNamara (via logerrit)]

 hwpfilter/source/hcode.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit aea9d86c844a9e702629316b3f42d49a1e071eff
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Feb 26 19:52:29 2022 +0000
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Mar 2 20:59:42 2022 +0100

    ofz#44991 don't skip over terminator
    
    Change-Id: Ibc942705a788db60c104d00916a45d595596285e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130560
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    (cherry picked from commit 4ac060fce70a4b116207d061efbb6185e6162d04)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130868
    Tested-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/hwpfilter/source/hcode.cxx b/hwpfilter/source/hcode.cxx
index fda36e0953ca..28bc97212fba 100644
--- a/hwpfilter/source/hcode.cxx
+++ b/hwpfilter/source/hcode.cxx
@@ -1217,6 +1217,8 @@ hchar_string kstr2hstr(uchar const* src)
         {
             ret.push_back(src[i] << 8 | src[i+1]);
             i++;
+            if (src[i] == '\0')
+                break;
         }
     }
     return ret;