mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bugs when interpreting POSIX-compliant headers that do not

Browse Source 
contain null bytes in the header or link names.
This commit is contained in:
Paul Eggert
1999-08-16 08:13:20 +00:00
parent 5e0e027651
commit da82a07e93
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/list.c
View File

@@ -386,7 +386,6 @@ read_header (void)
else
current_stat.st_size = OFF_FROM_CHARS (header->header.size);
header->header.name[NAME_FIELD_SIZE - 1] = '\0';
if (header->header.typeflag == GNUTYPE_LONGNAME
|| header->header.typeflag == GNUTYPE_LONGLINK)
{
@@ -425,18 +424,19 @@ read_header (void)
}
else
{
char *name = next_long_name;
char *name;
struct posix_header *h = &current_header->header;
char namebuf[sizeof h->prefix + 1 + sizeof h->name + 1];
char namebuf[sizeof h->prefix + 1 + NAME_FIELD_SIZE + 1];
name = next_long_name;
if (! name)
{
/* Accept file names as specified by POSIX.1-1996
section 10.1.1. */
int is_posix = (strcmp (h->magic, TMAGIC) == 0);
int posix_header = strcmp (h->magic, TMAGIC) == 0;
char *np = namebuf;
if (is_posix && h->prefix[0])
if (posix_header && h->prefix[0])
{
memcpy (np, h->prefix, sizeof h->prefix);
np[sizeof h->prefix] = '\0';
@@ -447,11 +447,17 @@ read_header (void)
np[sizeof h->name] = '\0';
name = namebuf;
}
assign_string (&current_file_name, name);
assign_string (&current_link_name,
(next_long_link ? next_long_link
: current_header->header.linkname));
name = next_long_link;
if (! name)
{
memcpy (namebuf, h->linkname, sizeof h->linkname);
namebuf[sizeof h->linkname] = '\0';
name = namebuf;
}
assign_string (&current_link_name, name);
next_long_link = next_long_name = 0;
return HEADER_SUCCESS;
}