|
|
58251f |
From d094dc02905605ca514baf87855f026b9bf52f1f Mon Sep 17 00:00:00 2001
|
|
|
58251f |
From: Tim Kientzle <kientzle@acm.org>
|
|
|
58251f |
Date: Sun, 8 Feb 2015 13:29:51 -0800
|
|
|
58251f |
Subject: [PATCH] Issue 405: segfault on malformed 7z archive
|
|
|
58251f |
|
|
|
58251f |
Reject a couple of nonsensical cases.
|
|
|
58251f |
---
|
|
|
58251f |
Makefile.am | 3 +
|
|
|
58251f |
libarchive/archive_read_support_format_7zip.c | 9 +++
|
|
|
58251f |
libarchive/test/CMakeLists.txt | 1 +
|
|
|
58251f |
.../test/test_read_format_7zip_malformed.7z.uu | 5 ++
|
|
|
58251f |
libarchive/test/test_read_format_7zip_malformed.c | 67 ++++++++++++++++++++++
|
|
|
58251f |
.../test/test_read_format_7zip_malformed2.7z.uu | 5 ++
|
|
|
58251f |
6 files changed, 90 insertions(+)
|
|
|
58251f |
create mode 100644 libarchive/test/test_read_format_7zip_malformed.7z.uu
|
|
|
58251f |
create mode 100644 libarchive/test/test_read_format_7zip_malformed.c
|
|
|
58251f |
create mode 100644 libarchive/test/test_read_format_7zip_malformed2.7z.uu
|
|
|
58251f |
|
|
|
58251f |
diff --git a/Makefile.am b/Makefile.am
|
|
|
58251f |
index d6e40a2..f6e1e20 100644
|
|
|
58251f |
--- a/Makefile.am
|
|
|
58251f |
+++ b/Makefile.am
|
|
|
58251f |
@@ -372,6 +372,7 @@ libarchive_test_SOURCES= \
|
|
|
58251f |
libarchive/test/test_read_filter_program_signature.c \
|
|
|
58251f |
libarchive/test/test_read_filter_uudecode.c \
|
|
|
58251f |
libarchive/test/test_read_format_7zip.c \
|
|
|
58251f |
+ libarchive/test/test_read_format_7zip_malformed.c \
|
|
|
58251f |
libarchive/test/test_read_format_ar.c \
|
|
|
58251f |
libarchive/test/test_read_format_cab.c \
|
|
|
58251f |
libarchive/test/test_read_format_cab_filename.c \
|
|
|
58251f |
@@ -599,6 +600,8 @@ libarchive_test_EXTRA_DIST=\
|
|
|
58251f |
libarchive/test/test_read_format_7zip_lzma1_2.7z.uu \
|
|
|
58251f |
libarchive/test/test_read_format_7zip_lzma1_lzma2.7z.uu \
|
|
|
58251f |
libarchive/test/test_read_format_7zip_lzma2.7z.uu \
|
|
|
58251f |
+ libarchive/test/test_read_format_7zip_malformed.7z.uu \
|
|
|
58251f |
+ libarchive/test/test_read_format_7zip_malformed2.7z.uu \
|
|
|
58251f |
libarchive/test/test_read_format_7zip_ppmd.7z.uu \
|
|
|
58251f |
libarchive/test/test_read_format_7zip_symbolic_name.7z.uu \
|
|
|
58251f |
libarchive/test/test_read_format_ar.ar.uu \
|
|
|
58251f |
diff --git a/libarchive/archive_read_support_format_7zip.c b/libarchive/archive_read_support_format_7zip.c
|
|
|
58251f |
index 194b8d5..e490c00 100644
|
|
|
58251f |
--- a/libarchive/archive_read_support_format_7zip.c
|
|
|
58251f |
+++ b/libarchive/archive_read_support_format_7zip.c
|
|
|
58251f |
@@ -1940,7 +1940,16 @@ read_CodersInfo(struct archive_read *a, struct _7z_coders_info *ci)
|
|
|
58251f |
return (-1);
|
|
|
58251f |
if (1000000 < ci->dataStreamIndex)
|
|
|
58251f |
return (-1);
|
|
|
58251f |
+ if (ci->numFolders > 0) {
|
|
|
58251f |
+ archive_set_error(&a->archive, -1,
|
|
|
58251f |
+ "Malformed 7-Zip archive");
|
|
|
58251f |
+ goto failed;
|
|
|
58251f |
+ }
|
|
|
58251f |
break;
|
|
|
58251f |
+ default:
|
|
|
58251f |
+ archive_set_error(&a->archive, -1,
|
|
|
58251f |
+ "Malformed 7-Zip archive");
|
|
|
58251f |
+ goto failed;
|
|
|
58251f |
}
|
|
|
58251f |
|
|
|
58251f |
if ((p = header_bytes(a, 1)) == NULL)
|
|
|
58251f |
diff --git a/libarchive/test/CMakeLists.txt b/libarchive/test/CMakeLists.txt
|
|
|
58251f |
index 6ac850d..08770d9 100644
|
|
|
58251f |
--- a/libarchive/test/CMakeLists.txt
|
|
|
58251f |
+++ b/libarchive/test/CMakeLists.txt
|
|
|
58251f |
@@ -87,6 +87,7 @@ IF(ENABLE_TEST)
|
|
|
58251f |
test_read_filter_program_signature.c
|
|
|
58251f |
test_read_filter_uudecode.c
|
|
|
58251f |
test_read_format_7zip.c
|
|
|
58251f |
+ test_read_format_7zip_malformed.c
|
|
|
58251f |
test_read_format_ar.c
|
|
|
58251f |
test_read_format_cab.c
|
|
|
58251f |
test_read_format_cab_filename.c
|
|
|
58251f |
diff --git a/libarchive/test/test_read_format_7zip_malformed.7z.uu b/libarchive/test/test_read_format_7zip_malformed.7z.uu
|
|
|
58251f |
new file mode 100644
|
|
|
58251f |
index 0000000..179f633
|
|
|
58251f |
--- /dev/null
|
|
|
58251f |
+++ b/libarchive/test/test_read_format_7zip_malformed.7z.uu
|
|
|
58251f |
@@ -0,0 +1,5 @@
|
|
|
58251f |
+begin 644 test_read_format_7zip_malformed.7z
|
|
|
58251f |
+M-WJ\KR<<,#"@P/<&!P````````!(`````````&:^$Y
|
|
|
58251f |
+'!P`'"S`P#```
|
|
|
58251f |
+`
|
|
|
58251f |
+end
|
|
|
58251f |
diff --git a/libarchive/test/test_read_format_7zip_malformed.c b/libarchive/test/test_read_format_7zip_malformed.c
|
|
|
58251f |
new file mode 100644
|
|
|
58251f |
index 0000000..4ca6f09
|
|
|
58251f |
--- /dev/null
|
|
|
58251f |
+++ b/libarchive/test/test_read_format_7zip_malformed.c
|
|
|
58251f |
@@ -0,0 +1,67 @@
|
|
|
58251f |
+/*-
|
|
|
58251f |
+ * Copyright (c) 2003-2007 Tim Kientzle
|
|
|
58251f |
+ * Copyright (c) 2011 Michihiro NAKAJIMA
|
|
|
58251f |
+ * All rights reserved.
|
|
|
58251f |
+ *
|
|
|
58251f |
+ * Redistribution and use in source and binary forms, with or without
|
|
|
58251f |
+ * modification, are permitted provided that the following conditions
|
|
|
58251f |
+ * are met:
|
|
|
58251f |
+ * 1. Redistributions of source code must retain the above copyright
|
|
|
58251f |
+ * notice, this list of conditions and the following disclaimer.
|
|
|
58251f |
+ * 2. Redistributions in binary form must reproduce the above copyright
|
|
|
58251f |
+ * notice, this list of conditions and the following disclaimer in the
|
|
|
58251f |
+ * documentation and/or other materials provided with the distribution.
|
|
|
58251f |
+ *
|
|
|
58251f |
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
|
58251f |
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
58251f |
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
58251f |
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
58251f |
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
58251f |
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
58251f |
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
58251f |
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
58251f |
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
58251f |
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
58251f |
+ */
|
|
|
58251f |
+#include "test.h"
|
|
|
58251f |
+__FBSDID("$FreeBSD$");
|
|
|
58251f |
+
|
|
|
58251f |
+static void
|
|
|
58251f |
+test_malformed1(void)
|
|
|
58251f |
+{
|
|
|
58251f |
+ const char *refname = "test_read_format_7zip_malformed.7z";
|
|
|
58251f |
+ struct archive *a;
|
|
|
58251f |
+ struct archive_entry *ae;
|
|
|
58251f |
+
|
|
|
58251f |
+ extract_reference_file(refname);
|
|
|
58251f |
+
|
|
|
58251f |
+ assert((a = archive_read_new()) != NULL);
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240));
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae);;
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
|
|
|
58251f |
+}
|
|
|
58251f |
+
|
|
|
58251f |
+static void
|
|
|
58251f |
+test_malformed2(void)
|
|
|
58251f |
+{
|
|
|
58251f |
+ const char *refname = "test_read_format_7zip_malformed2.7z";
|
|
|
58251f |
+ struct archive *a;
|
|
|
58251f |
+ struct archive_entry *ae;
|
|
|
58251f |
+
|
|
|
58251f |
+ extract_reference_file(refname);
|
|
|
58251f |
+
|
|
|
58251f |
+ assert((a = archive_read_new()) != NULL);
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240));
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_FATAL, archive_read_next_header(a, &ae);;
|
|
|
58251f |
+ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
|
|
|
58251f |
+}
|
|
|
58251f |
+
|
|
|
58251f |
+DEFINE_TEST(test_read_format_7zip_malformed)
|
|
|
58251f |
+{
|
|
|
58251f |
+ test_malformed1();
|
|
|
58251f |
+ test_malformed2();
|
|
|
58251f |
+}
|
|
|
58251f |
diff --git a/libarchive/test/test_read_format_7zip_malformed2.7z.uu b/libarchive/test/test_read_format_7zip_malformed2.7z.uu
|
|
|
58251f |
new file mode 100644
|
|
|
58251f |
index 0000000..e629a78
|
|
|
58251f |
--- /dev/null
|
|
|
58251f |
+++ b/libarchive/test/test_read_format_7zip_malformed2.7z.uu
|
|
|
58251f |
@@ -0,0 +1,5 @@
|
|
|
58251f |
+begin 644 test_read_format_7zip_malformed2.7z
|
|
|
58251f |
+M-WJ\KR<<,#"@P/<&!P````````!(`````````&:^$Y
|
|
|
58251f |
+(!P`'"S`!#`P`
|
|
|
58251f |
+`
|
|
|
58251f |
+end
|
|
|
58251f |
--
|
|
|
58251f |
2.7.4
|
|
|
58251f |
|