[Midnightbsd-cvs] src [7616] trunk/contrib/libarchive/libarchive/archive_write.c: Limit write requests to at most INT_MAX.

[laffer1 at midnightbsd.org]

Revision: 7616
          http://svnweb.midnightbsd.org/src/?rev=7616
Author:   laffer1
Date:     2016-05-31 16:44:29 -0400 (Tue, 31 May 2016)
Log Message:
-----------
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.

Obtained from: https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4

Modified Paths:
--------------
    trunk/contrib/libarchive/libarchive/archive_write.c

Modified: trunk/contrib/libarchive/libarchive/archive_write.c
===================================================================
--- trunk/contrib/libarchive/libarchive/archive_write.c	2016-05-31 20:36:32 UTC (rev 7615)
+++ trunk/contrib/libarchive/libarchive/archive_write.c	2016-05-31 20:44:29 UTC (rev 7616)
@@ -671,8 +671,13 @@
 _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));
 }