aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-09-22 10:43:39 -04:00
Code Activity

Fix NULL dereferences on %substr missing operands

Browse Source 
%substr with dangling id issues SIGSEV. Fix it.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov
2010-09-06 23:49:52 +04:00
parent 6908e58560
commit 35519d6719
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
preproc.c
View File

@@ -3395,12 +3395,13 @@ issue_error:
tline = expand_smacro(tline->next); tline = expand_smacro(tline->next);
last->next = NULL; last->next = NULL;
if (tline) /* skip expanded id */
t = tline->next; t = tline->next;
while (tok_type_(t, TOK_WHITESPACE)) while (tok_type_(t, TOK_WHITESPACE))
t = t->next; t = t->next;
/* t should now point to the string */ /* t should now point to the string */
if (t->type != TOK_STRING) { if (!tok_type_(t, TOK_STRING)) {
error(ERR_NONFATAL, error(ERR_NONFATAL,
"`%%substr` requires string as second parameter"); "`%%substr` requires string as second parameter");
free_tlist(tline); free_tlist(tline);