From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Sat, 31 Oct 2009 05:03:48 +0000 (-0400)
Subject: Bug fix. Bidding failed when a character of the end of buffer which
X-Git-Tag: v2.8.0~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0057a121bd4cc4a710bd13b896c6d073db1407d3;p=thirdparty%2Flibarchive.git

Bug fix. Bidding failed when a character of the end of buffer which
was checked for bidding was '\n' but not the end of file.

SVN-Revision: 1550
---

diff --git a/libarchive/archive_read_support_compression_uu.c b/libarchive/archive_read_support_compression_uu.c
index 80cb2dcc7..47a32e0e6 100644
--- a/libarchive/archive_read_support_compression_uu.c
+++ b/libarchive/archive_read_support_compression_uu.c
@@ -199,7 +199,11 @@ bid_get_line(struct archive_read_filter *filter,
 	int quit;
 	
 	quit = 0;
-	len = get_line(*b, *avail, nl);
+	if (*avail == 0) {
+		*nl = 0;
+		len = 0;
+	} else
+		len = get_line(*b, *avail, nl);
 	/*
 	 * Read bytes more while it does not reach the end of line.
 	 */
@@ -243,13 +247,13 @@ uudecode_bidder_bid(struct archive_read_filter_bidder *self,
 	l = 0;
 	firstline = 20;
 	ravail = avail;
-	while (avail) {
+	for (;;) {
 		len = bid_get_line(filter, &b, &avail, &ravail, &nl);
 		if (len < 0 || nl == 0)
 			return (0);/* Binary data. */
-		if (memcmp(b, "begin ", 6) == 0 && len >= 11)
+		if (memcmp(b, "begin ", 6) == 0 && len - nl >= 11)
 			l = 6;
-		else if (memcmp(b, "begin-base64 ", 13) == 0 && len >= 18)
+		else if (memcmp(b, "begin-base64 ", 13) == 0 && len - nl >= 18)
 			l = 13;
 		else
 			l = 0;