mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-06 18:30:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

BR 812417: Deadman counter for macro expansion

Browse Source 
Per BR 812417, certain macro expansions can hang NASM.  Allow a
deadman counter (currently set to 2^20) to fail out if it gets
ridiculous.
This commit is contained in:
H. Peter Anvin 2007-11-19 12:26:50 -08:00
parent a27ccb9f61
commit cb1cf59312
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
preproc.c
View File

@ -2981,6 +2981,8 @@ static Token *expand_mmac_params(Token * tline)
* Tokens from input to output a lot of the time, rather than
* actually bothering to destroy and replicate.)
*/
#define DEADMAN_LIMIT (1 << 20)
static Token *expand_smacro(Token * tline)
{
Token *t, *tt, *mstart, **tail, *thead;
@ -2992,6 +2994,7 @@ static Token *expand_smacro(Token * tline)
Token *org_tline = tline;
Context *ctx;
char *mname;
int deadman = 0;
/*
* Trick: we should avoid changing the start token pointer since it can
@ -3008,11 +3011,16 @@ static Token *expand_smacro(Token * tline)
org_tline->text = NULL;
}
again:
again:
tail = &thead;
thead = NULL;
while (tline) { /* main token loop */
if (++deadman > DEADMAN_LIMIT) {
error(ERR_NONFATAL, "interminable macro recursion");
break;
}
if ((mname = tline->text)) {
/* if this token is a local macro, look in local context */
if (tline->type == TOK_ID || tline->type == TOK_PREPROC_ID)