Permalink
Browse files

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.
  • Loading branch information...
1 parent d767d79 commit 22531545514043e04633e1c015c7540b9de9dbe4 @kientzle kientzle committed Mar 23, 2013
Showing with 5 additions and 0 deletions.
  1. +5 −0 libarchive/archive_write.c
@@ -673,8 +673,13 @@ static ssize_t
_archive_write_data(struct archive *_a, const void *buff, size_t s)
{
struct archive_write *a = (struct archive_write *)_a;
+ const size_t max_write = INT_MAX;
+
archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
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);
return ((a->format_write_data)(a, buff, s));
}

0 comments on commit 2253154

Please sign in to comment.