Skip to content

G
glslang
Commit 7d67c6cb by John Kessenich
Options

PP: Fix #1104: Missing check for #if overflow.

Also, rationalized this to generally make it safer and more readable. It could use a more modern approach, at some point...
parent 1a4bbc4a
Showing with 164 additions and 17 deletions
Test/baseResults/cppDeepNest.frag.out 0 → 100755
cppDeepNest.frag
ERROR: 0:66: '#if/#ifdef/#ifndef' : maximum nesting depth exceeded
ERROR: 0:66: '' : missing #endif
ERROR: 0:66: '' : syntax error, unexpected $end
ERROR: 3 compilation errors. No code generated.
Shader version: 100
ERROR: node is still EOpNull!
0:? Linker Objects
Linked fragment stage:
ERROR: Linking fragment stage: Missing entry point: Each stage requires one entry point
Shader version: 100
ERROR: node is still EOpNull!
0:? Linker Objects
Test/cppDeepNest.frag 0 → 100644
#ifdef O
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#if
#endif
glslang/MachineIndependent/preprocessor/Pp.cpp
...@@ -241,15 +241,20 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken) ...@@ -241,15 +241,20 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken)
int nextAtom = atomStrings.getAtom(ppToken->name); int nextAtom = atomStrings.getAtom(ppToken->name);
if (nextAtom == PpAtomIf || nextAtom == PpAtomIfdef || nextAtom == PpAtomIfndef) { if (nextAtom == PpAtomIf || nextAtom == PpAtomIfdef || nextAtom == PpAtomIfndef) {
depth++; depth++;
ifdepth++; if (ifdepth >= maxIfNesting || elsetracker >= maxIfNesting) {
elsetracker++; parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#if/#ifdef/#ifndef", "");
return EndOfInput;
} else {
ifdepth++;
elsetracker++;
}
} else if (nextAtom == PpAtomEndif) { } else if (nextAtom == PpAtomEndif) {
token = extraTokenCheck(nextAtom, ppToken, scanToken(ppToken)); token = extraTokenCheck(nextAtom, ppToken, scanToken(ppToken));
elseSeen[elsetracker] = false; elseSeen[elsetracker] = false;
--elsetracker; --elsetracker;
if (depth == 0) { if (depth == 0) {
// found the #endif we are looking for // found the #endif we are looking for
if (ifdepth) if (ifdepth > 0)
--ifdepth; --ifdepth;
break; break;
} }
...@@ -266,7 +271,7 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken) ...@@ -266,7 +271,7 @@ int TPpContext::CPPelse(int matchelse, TPpToken* ppToken)
parseContext.ppError(ppToken->loc, "#elif after #else", "#elif", ""); parseContext.ppError(ppToken->loc, "#elif after #else", "#elif", "");
/* we decrement ifdepth here, because CPPif will increment /* we decrement ifdepth here, because CPPif will increment
* it and we really want to leave it alone */ * it and we really want to leave it alone */
if (ifdepth) { if (ifdepth > 0) {
--ifdepth; --ifdepth;
elseSeen[elsetracker] = false; elseSeen[elsetracker] = false;
--elsetracker; --elsetracker;
...@@ -536,11 +541,12 @@ int TPpContext::evalToToken(int token, bool shortCircuit, int& res, bool& err, T ...@@ -536,11 +541,12 @@ int TPpContext::evalToToken(int token, bool shortCircuit, int& res, bool& err, T
int TPpContext::CPPif(TPpToken* ppToken) int TPpContext::CPPif(TPpToken* ppToken)
{ {
int token = scanToken(ppToken); int token = scanToken(ppToken);
elsetracker++; if (ifdepth >= maxIfNesting || elsetracker >= maxIfNesting) {
ifdepth++;
if (ifdepth > maxIfNesting) {
parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#if", ""); parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#if", "");
return 0; return EndOfInput;
} else {
elsetracker++;
ifdepth++;
} }
int res = 0; int res = 0;
bool err = false; bool err = false;
...@@ -556,11 +562,14 @@ int TPpContext::CPPif(TPpToken* ppToken) ...@@ -556,11 +562,14 @@ int TPpContext::CPPif(TPpToken* ppToken)
int TPpContext::CPPifdef(int defined, TPpToken* ppToken) int TPpContext::CPPifdef(int defined, TPpToken* ppToken)
{ {
int token = scanToken(ppToken); int token = scanToken(ppToken);
if (++ifdepth > maxIfNesting) { if (ifdepth > maxIfNesting || elsetracker > maxIfNesting) {
parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#ifdef", ""); parseContext.ppError(ppToken->loc, "maximum nesting depth exceeded", "#ifdef", "");
return 0; return EndOfInput;
} else {
elsetracker++;
ifdepth++;
} }
elsetracker++;
if (token != PpAtomIdentifier) { if (token != PpAtomIdentifier) {
if (defined) if (defined)
parseContext.ppError(ppToken->loc, "must be followed by macro name", "#ifdef", ""); parseContext.ppError(ppToken->loc, "must be followed by macro name", "#ifdef", "");
...@@ -886,16 +895,16 @@ int TPpContext::readCPPline(TPpToken* ppToken) ...@@ -886,16 +895,16 @@ int TPpContext::readCPPline(TPpToken* ppToken)
token = CPPdefine(ppToken); token = CPPdefine(ppToken);
break; break;
case PpAtomElse: case PpAtomElse:
if (elsetracker[elseSeen]) if (elseSeen[elsetracker])
parseContext.ppError(ppToken->loc, "#else after #else", "#else", ""); parseContext.ppError(ppToken->loc, "#else after #else", "#else", "");
elsetracker[elseSeen] = true; elseSeen[elsetracker] = true;
if (! ifdepth) if (ifdepth == 0)
parseContext.ppError(ppToken->loc, "mismatched statements", "#else", ""); parseContext.ppError(ppToken->loc, "mismatched statements", "#else", "");
token = extraTokenCheck(PpAtomElse, ppToken, scanToken(ppToken)); token = extraTokenCheck(PpAtomElse, ppToken, scanToken(ppToken));
token = CPPelse(0, ppToken); token = CPPelse(0, ppToken);
break; break;
case PpAtomElif: case PpAtomElif:
if (! ifdepth) if (ifdepth == 0)
parseContext.ppError(ppToken->loc, "mismatched statements", "#elif", ""); parseContext.ppError(ppToken->loc, "mismatched statements", "#elif", "");
if (elseSeen[elsetracker]) if (elseSeen[elsetracker])
parseContext.ppError(ppToken->loc, "#elif after #else", "#elif", ""); parseContext.ppError(ppToken->loc, "#elif after #else", "#elif", "");
...@@ -906,7 +915,7 @@ int TPpContext::readCPPline(TPpToken* ppToken) ...@@ -906,7 +915,7 @@ int TPpContext::readCPPline(TPpToken* ppToken)
token = CPPelse(0, ppToken); token = CPPelse(0, ppToken);
break; break;
case PpAtomEndif: case PpAtomEndif:
if (! ifdepth) if (ifdepth == 0)
parseContext.ppError(ppToken->loc, "mismatched statements", "#endif", ""); parseContext.ppError(ppToken->loc, "mismatched statements", "#endif", "");
else { else {
elseSeen[elsetracker] = false; elseSeen[elsetracker] = false;
......
glslang/MachineIndependent/preprocessor/PpContext.h
...@@ -309,7 +309,7 @@ protected: ...@@ -309,7 +309,7 @@ protected:
bool endOfReplacementList() { return inputStack.empty() || inputStack.back()->endOfReplacementList(); } bool endOfReplacementList() { return inputStack.empty() || inputStack.back()->endOfReplacementList(); }
bool isMacroInput() { return inputStack.size() > 0 && inputStack.back()->isMacroInput(); } bool isMacroInput() { return inputStack.size() > 0 && inputStack.back()->isMacroInput(); }
static const int maxIfNesting = 64; static const int maxIfNesting = 65;
int ifdepth; // current #if-#else-#endif nesting in the cpp.c file (pre-processor) int ifdepth; // current #if-#else-#endif nesting in the cpp.c file (pre-processor)
bool elseSeen[maxIfNesting]; // Keep a track of whether an else has been seen at a particular depth bool elseSeen[maxIfNesting]; // Keep a track of whether an else has been seen at a particular depth
......
gtests/AST.FromFile.cpp
...@@ -82,6 +82,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -82,6 +82,7 @@ INSTANTIATE_TEST_CASE_P(
"cppBad.vert", "cppBad.vert",
"cppBad2.vert", "cppBad2.vert",
"cppComplexExpr.vert", "cppComplexExpr.vert",
"cppDeepNest.frag",
"badChars.frag", "badChars.frag",
"pointCoord.frag", "pointCoord.frag",
"array.frag", "array.frag",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment