mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2024-12-15 09:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

BR 3392576: don't segfault on a bad %pragma limit

Browse Source 
Don't segfault on a bad %pragma limit. Instead treat a NULL pointer as
an empty string.

Reported-by: Ren Kimura <rkx1209dev@gmail.com>
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2019-08-16 01:12:54 -07:00
parent 480d5e2c8b
commit 93d41d8296
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
asm/nasm.c
View File

@ -212,6 +212,11 @@ nasm_set_limit(const char *limit, const char *valstr)
bool rn_error; bool rn_error;
int errlevel; int errlevel;
if (!limit)
limit = "";
if (!valstr)
valstr = "";
for (i = 0; i <= LIMIT_MAX; i++) { for (i = 0; i <= LIMIT_MAX; i++) {
if (!nasm_stricmp(limit, limit_info[i].name)) if (!nasm_stricmp(limit, limit_info[i].name))
break; break;
@ -234,7 +239,7 @@ nasm_set_limit(const char *limit, const char *valstr)
errlevel = ERR_WARNING|WARN_OTHER|ERR_USAGE; errlevel = ERR_WARNING|WARN_OTHER|ERR_USAGE;
else else
errlevel = ERR_WARNING|WARN_PRAGMA_BAD; errlevel = ERR_WARNING|WARN_PRAGMA_BAD;
nasm_error(errlevel, "invalid limit value: `%s'", limit); nasm_error(errlevel, "invalid limit value: `%s'", valstr);
return DIRR_ERROR; return DIRR_ERROR;
} }
if (val > LIMIT_MAX_VAL) if (val > LIMIT_MAX_VAL)