From: Joerg Sonnenberger <joerg.sonnenberger@gmail.com>
Date: Tue, 20 May 2008 04:09:43 +0000 (-0400)
Subject: Merge rev 1.5 from FreeBSD CVS: Return ARCHIVE_FATAL after
X-Git-Tag: v2.6.0~220
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c642cacb8327dfcb10849c02e9576065b7ddec8b;p=thirdparty%2Flibarchive.git

Merge rev 1.5 from FreeBSD CVS: Return ARCHIVE_FATAL after
failing malloc.

SVN-Revision: 72
---

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 1a25fe23f..c8ff054f4 100644
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -786,6 +786,7 @@ read_data(struct archive_read *a, const void **buff, size_t *size, off_t *offset
 			archive_set_error(&a->archive, ENOMEM,
 			    "Can't allocate memory");
 		}
+		return (ARCHIVE_FATAL);
 	}
 
 	*buff = mtree->buff;