d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix security bug in contains_dot_dot routine.

Browse Source 
PR:             43575
Submitted by:   Brett Glass <brett@lariat.org>

X-MFC after:	immediately
This commit is contained in:
Maxim Sobolev 2002-10-19 09:32:03 +00:00
parent 68aff0840c
commit be23b71211
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/tar/src/extract.c
View File

@ -1026,10 +1026,19 @@ extract_archive (void)
{ {
struct stat st1, st2; struct stat st1, st2;
int e; int e;
size_t skiplinkcrud;
if (absolute_names_option)
skiplinkcrud = 0;
else {
skiplinkcrud = FILESYSTEM_PREFIX_LEN (current_link_name);
while (ISSLASH (current_link_name[skiplinkcrud]))
skiplinkcrud++;
}
/* MSDOS does not implement links. However, djgpp's link() actually /* MSDOS does not implement links. However, djgpp's link() actually
copies the file. */ copies the file. */
status = link (current_link_name, CURRENT_FILE_NAME); status = link (current_link_name + skiplinkcrud, CURRENT_FILE_NAME);
if (status == 0) if (status == 0)
{ {

7
contrib/tar/src/misc.c
View File

@ -216,6 +216,13 @@ contains_dot_dot (char const *name)
return 0; return 0;
} }
while (! ISSLASH (*p)); while (! ISSLASH (*p));
do
{
if (! *p++)
return 0;
}
while ( ISSLASH (*p));
} }
} }