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

Merge two cpio fixes from libarchive.googlecode.com:

Browse Source 
1) Avoid an infinite loop in the header resync for certain malformed
    archives.
 2) Don't try to match hardlinks if the nlinks count is < 2.   This
    reduces the likelihood of a false hardlink match due to ino truncation.

MFC after:	7 days
This commit is contained in:
Tim Kientzle 2009-12-10 06:42:28 +00:00
parent 72bc4ff74d
commit 30a9ca8e26
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libarchive/archive_read_support_format_cpio.c
View File

@ -356,7 +356,7 @@ find_newc_header(struct archive_read *a)
* Scan ahead until we find something that looks
* like an odc header.
*/
while (p + sizeof(struct cpio_newc_header) < q) {
while (p + sizeof(struct cpio_newc_header) <= q) {
switch (p[5]) {
case '1':
case '2':
@ -490,7 +490,7 @@ find_odc_header(struct archive_read *a)
* Scan ahead until we find something that looks
* like an odc header.
*/
while (p + sizeof(struct cpio_odc_header) < q) {
while (p + sizeof(struct cpio_odc_header) <= q) {
switch (p[5]) {
case '7':
if (memcmp("070707", p, 6) == 0
@ -731,6 +731,9 @@ record_hardlink(struct cpio *cpio, struct archive_entry *entry)
dev_t dev;
ino_t ino;
if (archive_entry_nlink(entry) <= 1)
return;
dev = archive_entry_dev(entry);
ino = archive_entry_ino(entry);