summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-03-05 13:25:16 +0000
committerMichael Stahl <Michael.Stahl@cib.de>2019-03-06 11:31:36 +0100
commitcd376726cc8dad65d246493fee233c8018123bf1 (patch)
treeae98f35260812672f540122357cdae5b21d8b428
parenta02a160c8d5a70b30128c0880ba8853d0dbe0e7c (diff)
Resolves: tdf#123815 null terminator included in string
regression from... commit 18d636063fd7be165e7888af49372a6e2b851776 Author: Caolán McNamara <caolanm@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/68747 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
-rw-r--r--lotuswordpro/source/filter/tocread.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx
index e6af6f42e8f1..b64eec71676f 100644
--- a/lotuswordpro/source/filter/tocread.cxx
+++ b/lotuswordpro/source/filter/tocread.cxx
@@ -296,7 +296,9 @@ CBenTOCReader::ReadTOC()
return Err;
}
- OString sName(sBuffer, Length);
+ OString sName;
+ if (Length)
+ sName = OString(sBuffer, Length - 1);
CUtListElmt * pPrevNamedObjectListElmt;
if (FindNamedObject(&cpContainer->GetNamedObjects(),