From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Mon, 9 Nov 2009 07:58:11 +0000 (-0500)
Subject: Avoid possibility dereference of null pointer.
X-Git-Tag: v2.8.0~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d7323c5423b21273a03cd684eaf562bba400c2;p=thirdparty%2Flibarchive.git

Avoid possibility dereference of null pointer.

Found by Clang Static Analyzer.

SVN-Revision: 1624
---

diff --git a/libarchive/archive_read_support_compression_uu.c b/libarchive/archive_read_support_compression_uu.c
index ee844ce27..89f8c03a4 100644
--- a/libarchive/archive_read_support_compression_uu.c
+++ b/libarchive/archive_read_support_compression_uu.c
@@ -417,6 +417,10 @@ read_more:
 	d = __archive_read_filter_ahead(self->upstream, 1, &avail_in);
 	if (d == NULL && avail_in < 0)
 		return (ARCHIVE_FATAL);
+	/* Quiet a code analyzer; make sure avail_in must be zero
+	 * when d is NULL. */
+	if (d == NULL)
+		avail_in = 0;
 	used = 0;
 	total = 0;
 	out = uudecode->out_buff;