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

pax(1): Fix a bug with archives smaller than 512 bytes.

Browse Source 
The problem here is that the archive is too short (< 512 bytes). The
buffer routines, try to read at least 512 bytes, even when we try to
determine what format file we have, which is wrong.

Obtained from:	NetBSD (CVS rev 1.26)
MFC after:	5 days
This commit is contained in:
Pedro F. Giffuni 2016-12-21 15:26:59 +00:00
parent 33e7ba9cf9
commit 8ad81aaea6
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/pax/buf_subs.c
View File

@ -852,10 +852,13 @@ buf_fill(void)
/*
* errors require resync, EOF goes to next archive
* but in case we have not determined yet the format,
* this means that we have a very short file, so we
* are done again.
*/
if (cnt < 0)
break;
if (ar_next() < 0) {
if (frmt == NULL || ar_next() < 0) {
fini = 1;
return(0);
}