From: Martin Matuska <martin@matuska.org>
Date: Mon, 6 Feb 2017 01:48:24 +0000 (+0100)
Subject: XAR reader: implement checksum_cleanup() to avoid memory leaks on error
X-Git-Tag: v3.3.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9553a3a0e453dbc68ac9ec11dfe43c538ecd7c06;p=thirdparty%2Flibarchive.git

XAR reader: implement checksum_cleanup() to avoid memory leaks on error

Reported-By:	OSS-Fuzz issue 551
---

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index d3002af71..7a22beb9d 100644
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -394,6 +394,7 @@ static void	checksum_update(struct archive_read *, const void *,
 		    size_t, const void *, size_t);
 static int	checksum_final(struct archive_read *, const void *,
 		    size_t, const void *, size_t);
+static void	checksum_cleanup(struct archive_read *);
 static int	decompression_init(struct archive_read *, enum enctype);
 static int	decompress(struct archive_read *, const void **,
 		    size_t *, const void *, size_t *);
@@ -923,6 +924,7 @@ xar_cleanup(struct archive_read *a)
 	int r;
 
 	xar = (struct xar *)(a->format->data);
+	checksum_cleanup(a);
 	r = decompression_cleanup(a);
 	hdlink = xar->hdlink_list;
 	while (hdlink != NULL) {
@@ -1719,6 +1721,16 @@ decompression_cleanup(struct archive_read *a)
 	return (r);
 }
 
+static void
+checksum_cleanup(struct archive_read *a) {
+	struct xar *xar;
+
+	xar = (struct xar *)(a->format->data);
+
+	_checksum_final(&(xar->a_sumwrk), NULL, 0);
+	_checksum_final(&(xar->e_sumwrk), NULL, 0);
+}
+
 static void
 xmlattr_cleanup(struct xmlattr_list *list)
 {