[Libreoffice-commits] core.git: sax/source

[Vasily Melenchuk]

 sax/source/fastparser/fastparser.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d5837fcf2b1c60cfe29e2f41f32e22213710a1b8
Author: Vasily Melenchuk <Vasily.Melenchuk at cib.de>
Date:   Wed Feb 21 17:35:28 2018 +0300

    sax: don't crash during logging
    
    SaxParser was crashing during load of some MS documents if logging
    is enabled.
    
    Change-Id: I08a57b9a948bb4a35afcb82a29614c2f6a443446
    Reviewed-on: https://gerrit.libreoffice.org/50110
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index ff5388f53d5f..c6c9c0b207fd 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1221,7 +1221,7 @@ void FastSaxParserImpl::callbackStartElement(const xmlChar *localName , const xm
             produce();
         else
         {
-            SAL_INFO("sax.fastparser", " startElement line " << mxDocumentLocator->getLineNumber() << " column " << mxDocumentLocator->getColumnNumber() << " " << prefix << ":" << localName);
+            SAL_INFO("sax.fastparser", " startElement line " << mxDocumentLocator->getLineNumber() << " column " << mxDocumentLocator->getColumnNumber() << " " << ( prefix ? XML_CAST(prefix) : "(null)" ) << ":" << localName);
             rEntity.startElement( &rEvent );
         }
     }