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

Merge bugfix from vendor master branch:

Browse Source 
Limit write requests to at most INT_MAX.
This prevents a certain common programming error (passing -1 to write)
from leading to other problems deeper in the library.

References:
https://github.com/libarchive/libarchive/commit/22531545514043e0

Reported by:	Xin Li <delphij@FreeBSD.org>
Obtained from:  libarchive (master branch)
This commit is contained in:
Martin Matuska 2013-03-23 21:34:10 +00:00
parent accadf8de2
commit 70970541ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=248664
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/libarchive/libarchive/archive_write.c
View File

@ -671,8 +671,13 @@ static ssize_t
_archive_write_data(struct archive *_a, const void *buff, size_t s) _archive_write_data(struct archive *_a, const void *buff, size_t s)
{ {
struct archive_write *a = (struct archive_write *)_a; struct archive_write *a = (struct archive_write *)_a;
const size_t max_write = INT_MAX;
archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
ARCHIVE_STATE_DATA, "archive_write_data"); ARCHIVE_STATE_DATA, "archive_write_data");
/* In particular, this catches attempts to pass negative values. */
if (s > max_write)
s = max_write;
archive_clear_error(&a->archive); archive_clear_error(&a->archive);
return ((a->format_write_data)(a, buff, s)); return ((a->format_write_data)(a, buff, s));
} }