BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #1563: Corrupt token when an object macro miscalls a function macro

Browse source
This commit is contained in:
John Kessenich 2018-11-07 18:25:56 -07:00
parent 4ee2f75294
commit 4207c97b93
5 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
glslang/MachineIndependent/preprocessor/Pp.cpp Normal file → Executable file
View file

@ -1192,14 +1192,19 @@ MacroExpandResult TPpContext::MacroExpand(TPpToken* ppToken, bool expandUndef, b
TSourceLoc loc = ppToken->loc; // in case we go to the next line before discovering the error
in->mac = macro;
if (macro->functionLike) {
int token = scanToken(ppToken);
// We don't know yet if this will be a successful call of a
// function-like macro; need to look for a '(', but without trashing
// the passed in ppToken, until we know we are no longer speculative.
TPpToken parenToken;
int token = scanToken(&parenToken);
if (newLineOkay) {
while (token == '\n')
token = scanToken(ppToken);
token = scanToken(&parenToken);
}
if (token != '(') {
// function-like macro called with object-like syntax: okay, don't expand
UngetToken(token, ppToken);
// Function-like macro called with object-like syntax: okay, don't expand.
// (We ate exactly one token that might not be white space; put it back.
UngetToken(token, &parenToken);
delete in;
return MacroExpandNotStarted;
}