|
 |
7e034d8 |
From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001
|
|
|
7e034d8 |
From: Tim Kientzle <kientzle@acm.org>
|
|
|
7e034d8 |
Date: Fri, 22 Mar 2013 23:48:41 -0700
|
|
|
7e034d8 |
Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a
|
|
|
7e034d8 |
certain common programming error (passing -1 to write) from leading to other
|
|
|
7e034d8 |
problems deeper in the library.
|
|
|
7e034d8 |
|
|
|
7e034d8 |
---
|
|
|
7e034d8 |
libarchive/archive_write.c | 5 +++++
|
|
|
7e034d8 |
1 file changed, 5 insertions(+)
|
|
|
7e034d8 |
|
|
|
7e034d8 |
diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
|
|
|
7e034d8 |
index eede5e0..be85621 100644
|
|
|
7e034d8 |
--- a/libarchive/archive_write.c
|
|
|
7e034d8 |
+++ b/libarchive/archive_write.c
|
|
|
7e034d8 |
@@ -673,8 +673,13 @@ static ssize_t
|
|
|
7e034d8 |
_archive_write_data(struct archive *_a, const void *buff, size_t s)
|
|
|
7e034d8 |
{
|
|
|
7e034d8 |
struct archive_write *a = (struct archive_write *)_a;
|
|
|
7e034d8 |
+ const size_t max_write = INT_MAX;
|
|
|
7e034d8 |
+
|
|
|
7e034d8 |
archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC,
|
|
|
7e034d8 |
ARCHIVE_STATE_DATA, "archive_write_data");
|
|
|
7e034d8 |
+ /* In particular, this catches attempts to pass negative values. */
|
|
|
7e034d8 |
+ if (s > max_write)
|
|
|
7e034d8 |
+ s = max_write;
|
|
|
7e034d8 |
archive_clear_error(&a->archive);
|
|
|
7e034d8 |
return ((a->format_write_data)(a, buff, s));
|
|
|
7e034d8 |
}
|
|
|
7e034d8 |
--
|
|
|
7e034d8 |
1.8.1
|
|
|
7e034d8 |
|