From: nasm-bot f. C. S. B. <cha...@in...> - 2020-05-26 17:18:29
|
Commit-ID: 6e3f3411a1686e554beca3e766edb0a8efb6d617 Gitweb: http://repo.or.cz/w/nasm.git?a=commitdiff;h=6e3f3411a1686e554beca3e766edb0a8efb6d617 Author: Chang S. Bae <cha...@in...> AuthorDate: Wed, 25 Mar 2020 15:13:21 -0700 Committer: Chang S. Bae <cha...@in...> CommitDate: Wed, 1 Apr 2020 15:42:16 -0700 preproc: Fix the token in expanding the %+/%- macro-parameters The code looked to be unintentionally always nullifying the token pointer at first place in handling those macro-parameters. Remove it to avoid segfault. Fixes: de7acc3a46cb ("preproc: defer %00, %? and %?? expansion for nested macros, cleanups") Reported-by: C. Masloch <pu...@ul...> Link: https://bugzilla.nasm.us/show_bug.cgi?id=3392640 Signed-off-by: Chang S. Bae <cha...@in...> --- asm/preproc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/asm/preproc.c b/asm/preproc.c index befe77e8..cf770026 100644 --- a/asm/preproc.c +++ b/asm/preproc.c @@ -4833,8 +4833,6 @@ static Token *expand_mmac_params(Token * tline) unsigned long n; char *ep; - text = NULL; - n = strtoul(tok_text(t) + 2, &ep, 10); if (unlikely(*ep)) goto invalid; |