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

Correctly handle writes beyond the end of the archive entry

Browse Source 
(as determined by the initial size given to the header).
Libarchive recently changed to correctly return the amount
of data actually consumed in this case, which revealed this
bug in bsdtar.
This commit is contained in:
kientzle 2007-02-14 08:16:08 +00:00
parent a47cbc19d4
commit 3cdd817959
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.bin/tar/write.c
View File

@ -851,11 +851,19 @@ write_file_data(struct bsdtar *bsdtar, struct archive *a, int fd)
bytes_read = read(fd, buff, sizeof(buff));
while (bytes_read > 0) {
bytes_written = archive_write_data(a, buff, bytes_read);
if (bytes_written <= 0) {
if (bytes_written < 0) {
/* Write failed; this is bad */
bsdtar_warnc(bsdtar, 0, "%s", archive_error_string(a));
return (-1);
}
if (bytes_written < bytes_read) {
/* Write was truncated; warn but continue. */
bsdtar_warnc(bsdtar, 0,
"Truncated write; file may have grown while being archived.");
/* Make bsdtar return a final error because of this. */
bsdtar->return_value = 1;
return (0);
}
bytes_read = read(fd, buff, sizeof(buff));
}
return 0;