BUG: fix for bug 5837, libtar and long path names
This commit is contained in:
parent
c6089d1642
commit
c391c5cbf4
|
@ -93,16 +93,16 @@ th_set_path(TAR *t, char *pathname)
|
|||
if (pathname[strlen(pathname) - 1] != '/' && TH_ISDIR(t))
|
||||
strcpy(suffix, "/");
|
||||
|
||||
if (strlen(pathname) > T_NAMELEN && (t->options & TAR_GNU))
|
||||
if (strlen(pathname)+strlen(suffix) >= T_NAMELEN && (t->options & TAR_GNU))
|
||||
{
|
||||
/* GNU-style long name */
|
||||
t->th_buf.gnu_longname = strdup(pathname);
|
||||
strncpy(t->th_buf.name, t->th_buf.gnu_longname, T_NAMELEN);
|
||||
}
|
||||
else if (strlen(pathname) > T_NAMELEN)
|
||||
else if (strlen(pathname)+ strlen(suffix) >= T_NAMELEN)
|
||||
{
|
||||
/* POSIX-style prefix field */
|
||||
tmp = strchr(&(pathname[strlen(pathname) - T_NAMELEN - 1]), '/');
|
||||
tmp = strrchr(pathname, '/');
|
||||
if (tmp == NULL)
|
||||
{
|
||||
printf("!!! '/' not found in \"%s\"\n", pathname);
|
||||
|
|
Loading…
Reference in New Issue