From: Michihiro NAKAJIMA <ggcueroad@gmail.com>
Date: Wed, 3 Aug 2011 05:56:22 +0000 (-0400)
Subject: Properly set a error message when memory allocation fails in the RAR reader.
X-Git-Tag: v3.0.0a~209
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc8db296dbb764b142aa85f7dd90e01b61df201d;p=thirdparty%2Flibarchive.git

Properly set a error message when memory allocation fails in the RAR reader.

SVN-Revision: 3523
---

diff --git a/libarchive/archive_read_support_format_rar.c b/libarchive/archive_read_support_format_rar.c
index 5e7712d9c..ec979199a 100644
--- a/libarchive/archive_read_support_format_rar.c
+++ b/libarchive/archive_read_support_format_rar.c
@@ -671,8 +671,11 @@ read_header(struct archive_read *a, struct archive_entry *entry,
     header_size += rar->packed_size;
 
   filename_size = archive_le16dec(file_header.name_size);
-  if ((filename = malloc(filename_size+1)) == NULL)
+  if ((filename = malloc(filename_size+1)) == NULL) {
+    archive_set_error(&a->archive, ENOMEM,
+                      "Couldn't allocate memory.");
     return (ARCHIVE_FATAL);
+  }
   memcpy(filename, p, filename_size);
   filename[filename_size] = '\0';
   if (rar->file_flags & FHD_UNICODE)