procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preproc: don't loop on a variable that doesn't advance

Browse source 
When pasting and stripping %+ and whitespace tokens, we either need to
set *nextp in the loop, or treat next as a separate variable and
update *nextp after the loop finishes. This implements the second
option.

This fixes travis test "amx".

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2020-09-04 14:09:37 -07:00
parent a9ed8ced7c
commit ff97eb6f7e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asm/preproc.c
View file

@ -4985,12 +4985,14 @@ static bool paste_tokens(Token **head, const struct concat_mask *m,
* we can end up having multiple %+ tokens in a row;
* just drop whem in that case.
*/
while ((next = *nextp)) {
next = *nextp;
while (next) {
if (next->type == TOKEN_PASTE || next->type == TOKEN_WHITESPACE)
next = delete_Token(next);
else
break;
}
*nextp = next;
/*
* Nothing after? Just leave the existing token.