Fixed crash in lexer on empty input stream.

icculus · Feb 24, 2009 · d09bcaa · d09bcaa
1 parent 915a7cd
commit d09bcaa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/mojoshader_lexer.c b/mojoshader_lexer.c
@@ -1245,7 +1245,11 @@ Token preprocessor_lexer(IncludeState *s)
 		}
 	}
 yy206:
-	{ cursor=(const uchar*)s->source; goto scanner_loop; }
+	{
+                            token = cursor = (const uchar *) s->source;
+                            limit = cursor + s->bytes_left;
+                            goto scanner_loop;
+                        }
 yy207:
 	++YYCURSOR;
 	yych = *YYCURSOR;

diff --git a/mojoshader_lexer.re b/mojoshader_lexer.re
@@ -212,7 +212,12 @@ ppdirective:
         PP "endif"      { RET(TOKEN_PP_ENDIF); }
         PP "error"      { RET(TOKEN_PP_ERROR); }
         WHITESPACE      { goto ppdirective; }
-        ANY             { cursor=(const uchar*)s->source; goto scanner_loop; }
+
+        ANY             {
+                            token = cursor = (const uchar *) s->source;
+                            limit = cursor + s->bytes_left;
+                            goto scanner_loop;
+                        }
 */
 
 bad_chars: