github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-04-03 12:40:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

safety: replace occurrences of strcpy by pstrcpy

Browse Source
This commit is contained in:
grischka 2013-01-31 11:29:45 +01:00
parent 370547a550
commit 2f6b8469cc
4 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libtcc.c
View File

@ -1636,7 +1636,7 @@ PUB_FUNC char *tcc_default_target(TCCState *s, const char *default_file)
&& *ext) && *ext)
strcpy(ext, ".o"); strcpy(ext, ".o");
else else
pstrcpy(buf, sizeof(buf), "a.out"); strcpy(buf, "a.out");
return tcc_strdup(buf); return tcc_strdup(buf);
} }

22
tccelf.c
View File

@ -2992,20 +2992,6 @@ static int ld_next(TCCState *s1, char *name, int name_size)
return c; return c;
} }
/*
* Extract the file name from the library name
*
* /!\ No test on filename capacity, be careful
*/
static void libname_to_filename(TCCState *s1, const char libname[], char filename[])
{
if (!s1->static_link) {
sprintf(filename, "lib%s.so", libname);
} else {
sprintf(filename, "lib%s.a", libname);
}
}
static int ld_add_file(TCCState *s1, const char filename[]) static int ld_add_file(TCCState *s1, const char filename[])
{ {
int ret; int ret;
@ -3052,8 +3038,12 @@ static int ld_add_file_list(TCCState *s1, const char *cmd, int as_needed)
ret = -1; ret = -1;
goto lib_parse_error; goto lib_parse_error;
} }
strcpy(libname, &filename[1]); pstrcpy(libname, sizeof libname, &filename[1]);
libname_to_filename(s1, libname, filename); if (s1->static_link) {
snprintf(filename, sizeof filename, "lib%s.a", libname);
} else {
snprintf(filename, sizeof filename, "lib%s.so", libname);
}
} else if (t != LD_TOK_NAME) { } else if (t != LD_TOK_NAME) {
tcc_error_noabort("filename expected"); tcc_error_noabort("filename expected");
ret = -1; ret = -1;

2
tccgen.c
View File

@ -5580,7 +5580,7 @@ ST_FUNC void gen_inline_functions(void)
str = fn->token_str; str = fn->token_str;
fn->sym = NULL; fn->sym = NULL;
if (file) if (file)
strcpy(file->filename, fn->filename); pstrcpy(file->filename, sizeof file->filename, fn->filename);
sym->r = VT_SYM | VT_CONST; sym->r = VT_SYM | VT_CONST;
sym->type.t &= ~VT_INLINE; sym->type.t &= ~VT_INLINE;

6
tccpe.c
View File

@ -663,7 +663,7 @@ static int pe_write(struct pe_info *pe)
} }
} }
strcpy((char*)psh->Name, sh_name); pstrcpy((char*)psh->Name, sizeof psh->Name, sh_name);
psh->Characteristics = pe_sec_flags[si->cls]; psh->Characteristics = pe_sec_flags[si->cls];
psh->VirtualAddress = addr; psh->VirtualAddress = addr;
@ -933,7 +933,7 @@ static void pe_build_exports(struct pe_info *pe)
#if 1 #if 1
/* automatically write exports to <output-filename>.def */ /* automatically write exports to <output-filename>.def */
strcpy(buf, pe->filename); pstrcpy(buf, sizeof buf, pe->filename);
strcpy(tcc_fileextension(buf), ".def"); strcpy(tcc_fileextension(buf), ".def");
op = fopen(buf, "w"); op = fopen(buf, "w");
if (NULL == op) { if (NULL == op) {
@ -1598,7 +1598,7 @@ static int pe_load_def(TCCState *s1, FILE *fp)
case 0: case 0:
if (0 != strnicmp(p, "LIBRARY", 7)) if (0 != strnicmp(p, "LIBRARY", 7))
goto quit; goto quit;
strcpy(dllname, trimfront(p+7)); pstrcpy(dllname, sizeof dllname, trimfront(p+7));
++state; ++state;
continue; continue;