Prevent infinite loop on certain lex errors

This commit is contained in:
Max Brunsfeld 2014-06-11 11:29:13 -07:00
parent 4ad6278334
commit 155a57d3ab
2 changed files with 25 additions and 12 deletions

View file

@ -37,20 +37,20 @@ static inline char ts_lexer_lookahead_char(const ts_lexer *lexer) {
}
static inline int ts_lexer_advance(ts_lexer *lexer) {
static const char empty_chunk[1] = "";
static const char *empty_chunk = "";
if (lexer->position_in_chunk + 1 < lexer->chunk_size) {
lexer->position_in_chunk++;
} else {
lexer->chunk_start += lexer->chunk_size;
lexer->chunk = lexer->input.read_fn(lexer->input.data, &lexer->chunk_size);
if (lexer->chunk_size == 0) {
if (lexer->reached_end)
return 0;
lexer->chunk = empty_chunk;
lexer->chunk_size = 1;
lexer->reached_end = 1;
}
lexer->position_in_chunk = 0;
if (lexer->reached_end) {
return 0;
}
if (lexer->chunk_size == 0) {
lexer->reached_end = 1;
lexer->chunk = empty_chunk;
}
}
return 1;
}