Fix array out of bounds bug in processing if-else-endif macros.

If we are not inside an if macro, we cannot simply decrease
elsetracker.

Fixes https://github.com/KhronosGroup/glslang/issues/29.
This commit is contained in:
Lei Zhang 2016-03-09 14:53:57 -05:00
parent f7497e289b
commit 24e4bc99ac
5 changed files with 27 additions and 3 deletions

View File

@ -0,0 +1,12 @@
ERROR: 0:1: '#endif' : mismatched statements
ERROR: 0:2: '#endif' : mismatched statements
ERROR: 0:3: '#endif' : mismatched statements
ERROR: 0:4: '#endif' : mismatched statements
ERROR: 0:5: '#endif' : mismatched statements
ERROR: 0:6: '#endif' : mismatched statements
ERROR: 0:7: '#endif' : mismatched statements
ERROR: 0:10: 'preprocessor evaluation' : bad expression
ERROR: 0:11: '' : missing #endif
ERROR: 9 compilation errors. No code generated.

View File

@ -0,0 +1,10 @@
#endif
#endif
#endif
#endif
#endif
#endif
#endif
#if
#else

View File

@ -12,3 +12,4 @@ preprocessor.pragma.vert
preprocessor.simple.vert preprocessor.simple.vert
preprocessor.success_if_parse_would_fail.vert preprocessor.success_if_parse_would_fail.vert
preprocessor.defined.vert preprocessor.defined.vert
preprocessor.many.endif.vert

View File

@ -867,12 +867,13 @@ int TPpContext::readCPPline(TPpToken* ppToken)
token = CPPelse(0, ppToken); token = CPPelse(0, ppToken);
break; break;
case PpAtomEndif: case PpAtomEndif:
elseSeen[elsetracker] = false;
--elsetracker;
if (! ifdepth) if (! ifdepth)
parseContext.ppError(ppToken->loc, "mismatched statements", "#endif", ""); parseContext.ppError(ppToken->loc, "mismatched statements", "#endif", "");
else else {
elseSeen[elsetracker] = false;
--elsetracker;
--ifdepth; --ifdepth;
}
token = extraTokenCheck(PpAtomEndif, ppToken, scanToken(ppToken)); token = extraTokenCheck(PpAtomEndif, ppToken, scanToken(ppToken));
break; break;
case PpAtomIf: case PpAtomIf: