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

[Kohei Yoshida]

 sax/source/fastparser/fastparser.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8f59c9b4858cde1352eb60b2a3fe22853813b287
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Mon Jun 30 14:01:16 2014 -0400

    Check for empty() before calling top().
    
    Else it might crash sometimes.
    
    Change-Id: I6a24fff83c3d36346debae5c0f2b8c0646a15c01
    (cherry picked from commit 3f177756dbdb67d901453000c3f11694770d2761)
    Reviewed-on: https://gerrit.libreoffice.org/9991
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 0cfdb14..577f414 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -682,6 +682,9 @@ sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const sal_Char*pPrefix, int nPr
     sal_Int32 nNamespaceToken = FastToken::DONTKNOW;
 
     Entity& rEntity = getEntity();
+    if (rEntity.maNamespaceCount.empty())
+        return nNamespaceToken;
+
     sal_uInt32 nNamespace = rEntity.maNamespaceCount.top();
     while( nNamespace-- )
     {