Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue 406: Segfault on malformed Zip archive
Issue here was reading a size field as a signed number and then using that as an offset. Fixed by correctly masking the size value to an unsigned result. Includes test based on the archive provided in the issue report.
- Loading branch information
Showing
5 changed files
with
71 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
/*- | ||
* Copyright (c) 2003-2007 Tim Kientzle | ||
* Copyright (c) 2011 Michihiro NAKAJIMA | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions | ||
* are met: | ||
* 1. Redistributions of source code must retain the above copyright | ||
* notice, this list of conditions and the following disclaimer. | ||
* 2. Redistributions in binary form must reproduce the above copyright | ||
* notice, this list of conditions and the following disclaimer in the | ||
* documentation and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR | ||
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | ||
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
#include "test.h" | ||
__FBSDID("$FreeBSD$"); | ||
|
||
static void | ||
test_malformed1(void) | ||
{ | ||
const char *refname = "test_read_format_zip_malformed1.zip"; | ||
struct archive *a; | ||
struct archive_entry *ae; | ||
char *p; | ||
size_t s; | ||
|
||
extract_reference_file(refname); | ||
|
||
/* Verify with seeking reader. */ | ||
assert((a = archive_read_new()) != NULL); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_open_filename(a, refname, 10240)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); | ||
|
||
/* Verify with streaming reader. */ | ||
p = slurpfile(&s, refname); | ||
assert((a = archive_read_new()) != NULL); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); | ||
assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 31)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); | ||
assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); | ||
} | ||
|
||
DEFINE_TEST(test_read_format_zip_malformed) | ||
{ | ||
test_malformed1(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
begin 644 test_read_format_zip_malformed1.zip | ||
M4$L#!#`P,#`P,#`P,#`P,#`P,#`P,#`P,#`$`!P`,#`P,#`P"0`P,#`P,#`P | ||
1,#!U>`L``80P,#`P,#`P,#`` | ||
` | ||
end |