procyberian/nasm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BR 3392696: nasm_quote -- fixup callers

Browse source 
In 41e9682efe we've
changed the nasm_quote arguments still not all callers
were converted which could lead to nil dereference.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
This commit is contained in:
Cyrill Gorcunov 2020-07-11 19:12:13 +03:00
parent b14dbb95a1
commit 6c300aa488
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
asm/nasm.c
View file

@ -454,6 +454,7 @@ static char *nasm_quote_filename(const char *fn)
{
const unsigned char *p =
(const unsigned char *)fn;
size_t len;
if (!p || !*p)
return nasm_strdup("\"\"");
@ -477,7 +478,8 @@ static char *nasm_quote_filename(const char *fn)
return nasm_strdup(fn);
quote:
return nasm_quote(fn, NULL);
len = strlen(fn);
return nasm_quote(fn, &len);
}
static void timestamp(void)

5
asm/preproc.c
View file

@ -797,10 +797,11 @@ Token *quote_token(Token *t)
*/
static Token *quote_any_token(Token *t)
{
size_t len;
const char *s = tok_text(t);
size_t len = strlen(s);
char *p;
p = nasm_quote(tok_text(t), &len);
p = nasm_quote(s, &len);
t->type = TOK_STRING;
return set_text_free(t, p, len);
}