[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sax/source

[Caolán McNamara]

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

New commits:
commit 607a82d728a00743dbc5fabd486f615d590d3774
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 31 19:48:17 2013 +0000

    don't call top on an empty stack
    
    Fixes CppunitTest_sax_parser crash in a dbgutil build.
    
    Change-Id: Ibe4b4d3785535816b40d46fd0baa60f01e1f9d33
    Reviewed-on: https://gerrit.libreoffice.org/7267
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index c123401..0a609a1 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1088,7 +1088,7 @@ void FastSaxParserImpl::pushEntity( const Entity& rEntity )
 void FastSaxParserImpl::popEntity()
 {
     maEntities.pop();
-    mpTop = &maEntities.top();
+    mpTop = !maEntities.empty() ? &maEntities.top() : NULL;
 }
 
 // starts parsing with actual parser !