Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-08-22 02:29:00 +00:00
Code Issues Projects Releases Wiki Activity

tar: accept spaces at the end of header fields (compat)

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2009-09-23 17:16:37 +02:00
parent 844f990926
commit 8d338173a4
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
archival/libunarchive/get_header_tar.c
View File

@ -87,11 +87,13 @@ static unsigned long long getOctal(char *str, int len)
{ {
unsigned long long v; unsigned long long v;
/* NB: leading spaces are allowed. Using strtoull to handle that. /* NB: leading spaces are allowed. Using strtoull to handle that.
* The downside is that we accept e.g. "-123" too :) * The downside is that we accept e.g. "-123" too :(
*/ */
str[len] = '\0'; str[len] = '\0';
v = strtoull(str, &str, 8); v = strtoull(str, &str, 8);
if (*str && (!ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY || *str != ' ')) /* std: "Each numeric field is terminated by one or more
* <space> or NUL characters". We must support ' '! */
if (*str != '\0' && *str != ' ')
bb_error_msg_and_die("corrupted octal value in tar header"); bb_error_msg_and_die("corrupted octal value in tar header");
return v; return v;
} }
@ -262,20 +264,20 @@ char FAST_FUNC get_header_tar(archive_handle_t *archive_handle)
sum_s += ((signed char*)&tar)[i]; sum_s += ((signed char*)&tar)[i];
#endif #endif
} }
#if ENABLE_FEATURE_TAR_OLDGNU_COMPATIBILITY
sum = strtoul(tar.chksum, &cp, 8);
if ((*cp && *cp != ' ')
|| (sum_u != sum IF_FEATURE_TAR_OLDSUN_COMPATIBILITY(&& sum_s != sum))
) {
bb_error_msg_and_die("invalid tar header checksum");
}
#else
/* This field does not need special treatment (getOctal) */ /* This field does not need special treatment (getOctal) */
{
char *endp; /* gcc likes temp var for &endp */
sum = strtoul(tar.chksum, &endp, 8);
if ((*endp != '\0' && *endp != ' ')
|| (sum_u != sum IF_FEATURE_TAR_OLDSUN_COMPATIBILITY(&& sum_s != sum))
) {
bb_error_msg_and_die("invalid tar header checksum");
}
}
sum = xstrtoul(tar.chksum, 8); sum = xstrtoul(tar.chksum, 8);
if (sum_u != sum IF_FEATURE_TAR_OLDSUN_COMPATIBILITY(&& sum_s != sum)) { if (sum_u != sum IF_FEATURE_TAR_OLDSUN_COMPATIBILITY(&& sum_s != sum)) {
bb_error_msg_and_die("invalid tar header checksum"); bb_error_msg_and_die("invalid tar header checksum");
} }
#endif
/* 0 is reserved for high perf file, treat as normal file */ /* 0 is reserved for high perf file, treat as normal file */
if (!tar.typeflag) tar.typeflag = '0'; if (!tar.typeflag) tar.typeflag = '0';