diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2019-03-16 23:05:50 +0300 |
|---|---|---|
| committer | Cyrill Gorcunov <gorcunov@gmail.com> | 2019-03-16 23:19:12 +0300 |
| commit | 982186a1a3139763f2aa2710b32236009f64270d (patch) | |
| tree | 32b00868d4dd1a8a0a88da3b46ced06389eacca7 | |
| parent | 0bddd0f1b14aa614e1dd1c14297527dc24dee29c (diff) | |
| download | nasm-982186a1a3139763f2aa2710b32236009f64270d.tar.gz | |
preproc: Fix nil dereference on error paths
https://bugzilla.nasm.us/show_bug.cgi?id=3392562
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
| -rw-r--r-- | asm/preproc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/asm/preproc.c b/asm/preproc.c index 833a3d47..5f6b0a62 100644 --- a/asm/preproc.c +++ b/asm/preproc.c @@ -4198,7 +4198,8 @@ again: do { t = tline->next; while (tok_type_(t, TOK_SMAC_END)) { - t->a.mac->in_progress = false; + if (t->a.mac) + t->a.mac->in_progress = false; t->text = NULL; t = tline->next = delete_Token(t); } @@ -4228,7 +4229,8 @@ again: */ t = tline->next; while (tok_type_(t, TOK_SMAC_END)) { - t->a.mac->in_progress = false; + if (t->a.mac) + t->a.mac->in_progress = false; t->text = NULL; t = tline->next = delete_Token(t); } |