diff --git a/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas b/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas new file mode 100644 index 000000000000..fdf9f1e9948e --- /dev/null +++ b/basic/qa/basic_coverage/test_tdf150137_parse_fail.bas @@ -0,0 +1,37 @@ +' +' This file is part of the LibreOffice project. +' +' This Source Code Form is subject to the terms of the Mozilla Public +' License, v. 2.0. If a copy of the MPL was not distributed with this +' file, You can obtain one at http://mozilla.org/MPL/2.0/. +' + +Option Explicit + +Function doUnitTest() As String + On Error GoTo ErrorHandler ' Set up error handler + + Dim Xml As String + Dim XmlLen As Long + ' Not namespace-well-formed XML, parse is expected to fail + Xml = "" + XmlLen = Len(Xml) + Dim XmlByte(1 To XmlLen) As Byte + Dim Index As Integer + For Index = 1 To XmlLen + XmlByte(Index) = Asc(Mid(Xml, Index, 1)) + Next + Dim source As Object + source = CreateUnoStruct("com.sun.star.xml.sax.InputSource") + source.aInputStream = com.sun.star.io.SequenceInputStream.createStreamFromSequence(XmlByte) + Dim parser As Object + parser = CreateUnoService("com.sun.star.xml.sax.FastParser") + ' Parse crashed before the fix + parser.ParseStream(source) + + ' Shouldn't end up here + doUnitTest = "FAIL" + Exit Function +ErrorHandler: + doUnitTest = "OK" +End Function diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx index fd1b147f044e..3c67010ad1cb 100644 --- a/sax/source/fastparser/fastparser.cxx +++ b/sax/source/fastparser/fastparser.cxx @@ -1264,12 +1264,14 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm OUString aElementPrefix; if( prefix != nullptr ) { - if ( !m_bIgnoreMissingNSDecl || URI != nullptr ) - sNamespace = OUString( XML_CAST( URI ), strlen( XML_CAST( URI )), RTL_TEXTENCODING_UTF8 ); - else - sNamespace.clear(); - nNamespaceToken = GetNamespaceToken( sNamespace ); aElementPrefix = OUString( XML_CAST( prefix ), strlen( XML_CAST( prefix )), RTL_TEXTENCODING_UTF8 ); + if ( URI != nullptr ) + sNamespace = OUString( XML_CAST( URI ), strlen( XML_CAST( URI )), RTL_TEXTENCODING_UTF8 ); + else if ( m_bIgnoreMissingNSDecl ) + sNamespace.clear(); + else + throw SAXException("No namespace defined for " + aElementPrefix, {}, {}); + nNamespaceToken = GetNamespaceToken( sNamespace ); } OUString aElementLocalName( XML_CAST( localName ), strlen( XML_CAST( localName )), RTL_TEXTENCODING_UTF8 ); rEvent.msNamespace = sNamespace;