mirror of
https://github.com/netwide-assembler/nasm.git
synced 2025-02-11 17:10:45 +08:00
Fix NULL dereferences on %substr missing operands
%substr with dangling id issues SIGSEV. Fix it. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
parent
e12c50d274
commit
49cd6fbccf
@ -3395,12 +3395,13 @@ issue_error:
|
||||
tline = expand_smacro(tline->next);
|
||||
last->next = NULL;
|
||||
|
||||
t = tline->next;
|
||||
if (tline) /* skip expanded id */
|
||||
t = tline->next;
|
||||
while (tok_type_(t, TOK_WHITESPACE))
|
||||
t = t->next;
|
||||
|
||||
/* t should now point to the string */
|
||||
if (t->type != TOK_STRING) {
|
||||
if (!tok_type_(t, TOK_STRING)) {
|
||||
error(ERR_NONFATAL,
|
||||
"`%%substr` requires string as second parameter");
|
||||
free_tlist(tline);
|
||||
|
Loading…
Reference in New Issue
Block a user