Fix infinite loop when encountering \r in a string

SVN-Revision: 5886

diff --git a/src/lisp/lexer.cpp b/src/lisp/lexer.cpp
index 451cb9a..18f28e2 100644 (file)
--- a/src/lisp/lexer.cpp
+++ b/src/lisp/lexer.cpp
@@ -102,8 +102,8 @@ Lexer::getNextToken()
       return TOKEN_CLOSE_PAREN;
     case '"': {  // string
       int startline = linenumber;
-      nextChar();
       while(1) {
+        nextChar();
         switch(c) {
         case '"':
           nextChar();
@@ -132,7 +132,8 @@ Lexer::getNextToken()
         default:
           break;
         }
-        addChar();
+        if(token_length < MAX_TOKEN_LENGTH)
+          token_string[token_length++] = c;
       }
 string_finished:
       token_string[token_length] = 0;