[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - lotuswordpro/source

[Libreoffice Gerrit user]

 lotuswordpro/source/filter/tocread.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 6c0a06c550f9fcd9a2b107954a4eb466c032ef4a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Mar 5 13:25:16 2019 +0000
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Mar 6 11:31:56 2019 +0100

    Resolves: tdf#123815 null terminator included in string
    
    regression from...
    
    commit 18d636063fd7be165e7888af49372a6e2b851776
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Jun 19 09:46:31 2017 +0100
    
        ofz: use OString instead of bare char*
    
    this is no use to the reporter though, as the document format is
    10 and 11 is the oldest the filter will open
    
    Change-Id: I4cdfe92e37f047493a6eab95f0e8e9f5dced1a35
    Reviewed-on: https://gerrit.libreoffice.org/68746
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index baf84184319b..043a2167671f 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -291,7 +291,9 @@ CBenTOCReader::ReadTOC()
                         return Err;
                     }
 
-                    OString sName(sBuffer, Length);
+                    OString sName;
+                    if (Length)
+                        sName = OString(sBuffer, Length - 1);
 
                     CUtListElmt * pPrevNamedObjectListElmt;
                     if (FindNamedObject(&cpContainer->GetNamedObjects(),