[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 148b3cfd0b948163416f1d19ee6876d3459f1d9f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 13 16:41:31 2018 +0100
Commit:     Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Tue Aug 14 10:52:59 2018 +0200

    ofz: check sequence length before use
    
    Change-Id: I137a9de49c5a73eb5f277dc1519e5e036abba31c
    Reviewed-on: https://gerrit.libreoffice.org/58946
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 4848d1d59aad..4858570b8572 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -633,6 +633,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);