aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00
Code

preproc.c: make extra sure tokens are always null-terminated

Browse Source 
In tok_set_text() and tok_set_text_free(), don't trust that
the caller has given us a zero-terminated string.

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin (Intel) 2020-06-14 19:49:19 -07:00
parent 42894381c9
commit 00335e43ef
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
asm/preproc.c
View File

@ -370,12 +370,13 @@ static Token *set_text(struct Token *t, const char *text, size_t len)
if (t->len > INLINE_TEXT) if (t->len > INLINE_TEXT)
nasm_free(t->text.p.ptr); nasm_free(t->text.p.ptr);
nasm_zero(t->text.a); nasm_zero(t->text);
t->len = tok_check_len(len); t->len = len = tok_check_len(len);
textp = (len > INLINE_TEXT) textp = (len > INLINE_TEXT)
? (t->text.p.ptr = nasm_malloc(len+1)) : t->text.a; ? (t->text.p.ptr = nasm_malloc(len+1)) : t->text.a;
memcpy(textp, text, len+1); memcpy(textp, text, len);
textp[len] = '\0';
return t; return t;
} }
@ -383,18 +384,20 @@ static Token *set_text(struct Token *t, const char *text, size_t len)
* Set the text field to the existing pre-allocated string, either * Set the text field to the existing pre-allocated string, either
* taking over or freeing the allocation in the process. * taking over or freeing the allocation in the process.
*/ */
static Token *set_text_free(struct Token *t, char *text, unsigned int len) static Token *set_text_free(struct Token *t, char *text, size_t len)
{ {
if (t->len > INLINE_TEXT) if (t->len > INLINE_TEXT)
nasm_free(t->text.p.ptr); nasm_free(t->text.p.ptr);
nasm_zero(t->text.a); nasm_zero(t->text);
t->len = tok_check_len(len); t->len = len = tok_check_len(len);
if (len > INLINE_TEXT) { if (len > INLINE_TEXT) {
t->text.p.ptr = text; t->text.p.ptr = text;
text[len] = '\0';
} else { } else {
memcpy(t->text.a, text, len+1); memcpy(t->text.a, text, len);
t->text.a[len] = '\0';
nasm_free(text); nasm_free(text);
} }