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

[Markus Mohrhard]

 basic/source/comp/token.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4ffa47d9c1dafac4712b7fcac9a7df25b3392386
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Feb 11 00:32:32 2014 +0100

    fix crash when importing unsupported macro content, related fdo#59374
    
    Change-Id: I960c8174454074fd9ddb27fb17244d782c4cb24c
    Reviewed-on: https://gerrit.libreoffice.org/8038
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/comp/token.cxx b/basic/source/comp/token.cxx
index bc0519d..51633c8 100644
--- a/basic/source/comp/token.cxx
+++ b/basic/source/comp/token.cxx
@@ -359,6 +359,12 @@ SbiToken SbiTokenizer::Next()
     {
         return eCurTok = FIXSTRING;
     }
+    else if( aSym.isEmpty() )
+    {
+        //something went wrong
+        bEof = bEos = true;
+        return eCurTok = EOLN;
+    }
     // Special cases of characters that are between "Z" and "a". ICompare()
     // evaluates the position of these characters in different ways.
     else if( aSym[0] == '^' )