mirror of
https://github.com/netwide-assembler/nasm.git
synced 2025-01-30 16:41:05 +08:00
Merge branch 'master' of git+ssh://ccrayne@repo.or.cz/srv/git/nasm
This commit is contained in:
commit
0d3b89bc4e
@ -1840,7 +1840,7 @@ static int do_directive(Token * tline)
|
||||
origline = tline;
|
||||
|
||||
skip_white_(tline);
|
||||
if (!tok_type_(tline, TOK_PREPROC_ID) ||
|
||||
if (!tline || !tok_type_(tline, TOK_PREPROC_ID) ||
|
||||
(tline->text[1] == '%' || tline->text[1] == '$'
|
||||
|| tline->text[1] == '!'))
|
||||
return NO_DIRECTIVE_FOUND;
|
||||
@ -2093,7 +2093,6 @@ static int do_directive(Token * tline)
|
||||
if (!t || (t->type != TOK_STRING &&
|
||||
t->type != TOK_INTERNAL_STRING)) {
|
||||
error(ERR_NONFATAL, "`%%depend' expects a file name");
|
||||
free_tlist(t);
|
||||
free_tlist(origline);
|
||||
return DIRECTIVE_FOUND; /* but we did _something_ */
|
||||
}
|
||||
@ -2110,7 +2109,6 @@ static int do_directive(Token * tline)
|
||||
*deptail = sl;
|
||||
deptail = &sl->next;
|
||||
}
|
||||
free_tlist(t);
|
||||
free_tlist(origline);
|
||||
return DIRECTIVE_FOUND;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user