thac0/nasm
0
0
Fork 0
forked from aniani/nasm
Code Activity

preproc.c: Fix NULL dereference on package absence

Browse Source 
If package can't be retrieved we should not attempt
to dereference NULL'ed pointer which leads to segmentation
fault.

Reported-by: Serge
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov
2010-02-12 22:00:18 +03:00
parent d5d36498aa
commit bebf0d2157
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
preproc.c
View File

@@ -2398,7 +2398,7 @@ static int do_directive(Token * tline)
case PP_USE: case PP_USE:
{ {
static macros_t *use_pkg; static macros_t *use_pkg;
const char *pkg_macro; const char *pkg_macro = NULL;
tline = tline->next; tline = tline->next;
skip_white_(tline); skip_white_(tline);
@@ -2419,9 +2419,9 @@ static int do_directive(Token * tline)
use_pkg = nasm_stdmac_find_package(tline->text); use_pkg = nasm_stdmac_find_package(tline->text);
if (!use_pkg) if (!use_pkg)
error(ERR_NONFATAL, "unknown `%%use' package: %s", tline->text); error(ERR_NONFATAL, "unknown `%%use' package: %s", tline->text);
/* The first string will be <%define>__USE_*__ */ else
pkg_macro = (char *)use_pkg + 1; pkg_macro = (char *)use_pkg + 1; /* The first string will be <%define>__USE_*__ */
if (!smacro_defined(NULL, pkg_macro, 0, NULL, true)) { if (use_pkg && smacro_defined(NULL, pkg_macro, 0, NULL, true)) {
/* Not already included, go ahead and include it */ /* Not already included, go ahead and include it */
stdmacpos = use_pkg; stdmacpos = use_pkg;
} }