diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-07-31 18:46:11 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-07-31 18:46:11 -0700 |
| commit | 932de6c252b2420c3e0f0a8d4d90463d59ae4869 (patch) | |
| tree | 55b675bb582354ac25fb97342b7a80233c011969 | |
| parent | f7d863b7d1703b055f11e0087baac640b016b880 (diff) | |
| download | nasm-932de6c252b2420c3e0f0a8d4d90463d59ae4869.tar.gz nasm-932de6c252b2420c3e0f0a8d4d90463d59ae4869.tar.bz2 nasm-932de6c252b2420c3e0f0a8d4d90463d59ae4869.zip | |
BR 2034542: fix crash when touching __FILE__
Touching __FILE__ would cause a dereference of an uninitialized
pointer. Fix.
| -rw-r--r-- | preproc.c | 2 | ||||
| -rw-r--r-- | test/_file_.asm | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -3493,7 +3493,7 @@ again: if (!m->expansion) { if (!strcmp("__FILE__", m->name)) { int32_t num = 0; - char *file; + char *file = NULL; src_get(&num, &file); tline->text = nasm_quote(file, strlen(file)); tline->type = TOK_STRING; diff --git a/test/_file_.asm b/test/_file_.asm new file mode 100644 index 0000000..1ec7187 --- /dev/null +++ b/test/_file_.asm @@ -0,0 +1,5 @@ +;Testname=bin; Arguments=-fbin -o_file_.bin; Files=.stdout .stderr _file_.bin + db __FILE__, `\r\n` + db __FILE__, `\r\n` + dw __LINE__ + dw __LINE__ |