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

Fix non-deterministic archive type detection

Browse Source 
Due to analysis of partly uninitialized read-ahead buffer
(short_read call), we sometimes mistakenly classified very small
compressed archives as non-compressed; which in turn caused
extraction failure.

* src/buffer.c (check_compressed_archive): Don't assume that
archives smaller than BLOCKSIZE could be non-compressed, as tar
header always has at least one block.
This commit is contained in:
Pavel Raiskup
2017-03-30 13:30:15 +02:00
committed by Sergey Poznyakoff
parent 8b9026f3ae
commit 1e8b786e65
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/buffer.c
View File

@@ -402,10 +402,12 @@ check_compressed_archive (bool *pshort)
/* Restore global values */
read_full_records = sfr;
if ((strcmp (record_start->header.magic, TMAGIC) == 0 ||
strcmp (record_start->buffer + offsetof (struct posix_header, magic),
OLDGNU_MAGIC) == 0) &&
tar_checksum (record_start, true) == HEADER_SUCCESS)
if (record_start != record_end /* no files smaller than BLOCKSIZE */
&& (strcmp (record_start->header.magic, TMAGIC) == 0
|| strcmp (record_start->buffer + offsetof (struct posix_header,
magic),
OLDGNU_MAGIC) == 0)
&& tar_checksum (record_start, true) == HEADER_SUCCESS)
/* Probably a valid header */
return ct_tar;