preprocessor: Check for line number overflow

src/compiler/preprocessor/DiagnosticsBase.h

@@ -63,6 +63,7 @@ class Diagnostics
         PP_INVALID_LINE_DIRECTIVE,
         PP_NON_PP_TOKEN_BEFORE_EXTENSION_ESSL3,
         PP_UNDEFINED_SHIFT,
+        PP_TOKENIZER_ERROR,
         PP_ERROR_END,
 
         PP_WARNING_BEGIN,

src/compiler/preprocessor/Token.h

@@ -19,7 +19,9 @@ struct Token
 {
     enum Type
     {
-        LAST = 0,  // EOF.
+        // Calling this ERROR causes a conflict with wingdi.h
+        GOT_ERROR = -1,
+        LAST  = 0,  // EOF.
 
         IDENTIFIER = 258,
 

src/compiler/preprocessor/Tokenizer.l

@@ -110,7 +110,14 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
 "/*" { BEGIN(COMMENT); }
 <COMMENT>[^*\r\n]+
 <COMMENT>"*"
-<COMMENT>{NEWLINE} { ++yylineno; }
+<COMMENT>{NEWLINE} {
+    if (yylineno == INT_MAX)
+    {
+        *yylval = "Integer overflow on line number";
+        return pp::Token::GOT_ERROR;
+    }
+    ++yylineno;
+}
 <COMMENT>"*/" {
     yyextra->leadingSpace = true;
     BEGIN(INITIAL);
@@ -237,13 +244,16 @@ FRACTIONAL_CONSTANT  ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
 [ \t\v\f]+   { yyextra->leadingSpace = true; }
 
 {NEWLINE} {
+    if (yylineno == INT_MAX)
+    {
+        *yylval = "Integer overflow on line number";
+        return pp::Token::GOT_ERROR;
+    }
     ++yylineno;
     yylval->assign(1, '\n');
     return '\n';
 }
 
-\\{NEWLINE} { ++yylineno; }
-
 . {
     yylval->assign(1, yytext[0]);
     return pp::Token::PP_OTHER;
@@ -318,7 +328,18 @@ void Tokenizer::setMaxTokenSize(size_t maxTokenSize)
 
 void Tokenizer::lex(Token *token)
 {
-    token->type = yylex(&token->text, &token->location, mHandle);
+    int tokenType = yylex(&token->text, &token->location, mHandle);
+
+    if (tokenType == Token::GOT_ERROR)
+    {
+        mContext.diagnostics->report(Diagnostics::PP_TOKENIZER_ERROR, token->location, token->text);
+        token->type = Token::LAST;
+    }
+    else
+    {
+        token->type = tokenType;
+    }
+
     if (token->text.size() > mMaxTokenSize)
     {
         mContext.diagnostics->report(Diagnostics::PP_TOKEN_TOO_LONG,

src/tests/preprocessor_tests/location_test.cpp

@@ -267,6 +267,36 @@ TEST_F(LocationTest, LineDirectiveMissingNewline)
     mPreprocessor.lex(&token);
 }
 
+// Test for an error being generated when the line number overflows - regular version
+TEST_F(LocationTest, LineOverflowRegular)
+{
+    const char *str = "#line 2147483647\n\n";
+
+    ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
+
+    using testing::_;
+    // Error reported about EOF.
+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_TOKENIZER_ERROR, _, _));
+
+    pp::Token token;
+    mPreprocessor.lex(&token);
+}
+
+// Test for an error being generated when the line number overflows - inside /* */ comment version
+TEST_F(LocationTest, LineOverflowInComment)
+{
+    const char *str = "#line 2147483647\n/*\n*/";
+
+    ASSERT_TRUE(mPreprocessor.init(1, &str, NULL));
+
+    using testing::_;
+    // Error reported about EOF.
+    EXPECT_CALL(mDiagnostics, print(pp::Diagnostics::PP_TOKENIZER_ERROR, _, _));
+
+    pp::Token token;
+    mPreprocessor.lex(&token);
+}
+
 struct LineTestParam
 {
     const char* str;