summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-08-13 16:41:31 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-05 14:28:45 +0200
commit9b4e1c6303d1238257ea201bbf5b5ac2ab10bc46 (patch)
tree3004334f4e80abe86bc731d2dca34be796114c9f
parentforcepoint#55 invalid iterator increment (diff)
downloadcore-9b4e1c6303d1238257ea201bbf5b5ac2ab10bc46.tar.gz
core-9b4e1c6303d1238257ea201bbf5b5ac2ab10bc46.zip
ofz#9870: check sequence length before use
Change-Id: I137a9de49c5a73eb5f277dc1519e5e036abba31c Reviewed-on: https://gerrit.libreoffice.org/58946 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 148b3cfd0b948163416f1d19ee6876d3459f1d9f)
-rw-r--r--writerfilter/source/ooxml/OOXMLDocumentImpl.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 9ede7431bf6c..86ba0026c60d 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -634,6 +634,12 @@ void OOXMLDocumentImpl::resolveGlossaryStream(Stream & /*rStream*/)
OOXMLStream::Pointer_t gStream;
uno::Sequence< beans::StringPair > aSeq = aSeqs[j];
//Follows following aSeq[0] is Id, aSeq[1] is Type, aSeq[2] is Target
+ if (aSeq.getLength() < 3)
+ {
+ SAL_WARN("writerfilter.ooxml", "too short sequence");
+ continue;
+ }
+
OUString gId(aSeq[0].Second);
OUString gType(aSeq[1].Second);
OUString gTarget(aSeq[2].Second);