github-mirror/libarchive
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3153 from stoeckmann/cab_multi

Browse Source 
cab: Fix multi volume parser
(cherry picked from commit 5e566cf0c6)
This commit is contained in:
Dustin L. Howett authored and Martin Matuska committed 2026-06-23 11:05:59 +02:00
1 parent 3f6d7526d7
commit 5e2a2977ad
6 files changed
+113 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Makefile.am
+3
View File
@@ -493,6 +493,7 @@ libarchive_test_SOURCES= \
libarchive/test/test_read_format_cab_filename.c \
libarchive/test/test_read_format_cab_lzx_oob.c \
libarchive/test/test_read_format_cab_mszip_oob.c \
libarchive/test/test_read_format_cab_multi.c \
libarchive/test/test_read_format_cab_skip_malformed.c \
libarchive/test/test_read_format_cpio_afio.c \
libarchive/test/test_read_format_cpio_bin.c \
@@ -904,6 +905,8 @@ libarchive_test_EXTRA_DIST=\
libarchive/test/test_read_format_cab_3.cab.uu \
libarchive/test/test_read_format_cab_filename_cp932.cab.uu \
libarchive/test/test_read_format_cab_lzx_oob.cab.uu \
libarchive/test/test_read_format_cab_multi.p1.cab.uu \
libarchive/test/test_read_format_cab_multi.p2.cab.uu \
libarchive/test/test_read_format_cab_skip_malformed.cab.uu \
libarchive/test/test_read_format_cpio_afio_header.part1.cpio.uu \
libarchive/test/test_read_format_cpio_afio_header.part2.cpio.uu \
libarchive/archive_read_support_format_cab.c
+14 -10
View File
@@ -624,7 +624,7 @@ cab_read_header(struct archive_read *a)
struct cab *cab;
struct cfheader *hd;
size_t bytes, used;
ssize_t len;
ssize_t avail, len;
int64_t skip;
int err, i;
int cur_folder, prev_folder;
@@ -688,29 +688,34 @@ cab_read_header(struct archive_read *a)
hd->cffolder = 0;/* Avoid compiling warning. */
if (hd->flags & PREV_CABINET) {
/* How many bytes are used for szCabinetPrev. */
if ((p = __archive_read_ahead(a, used+256, NULL)) == NULL)
if ((p = cab_read_ahead_remaining(a, used + 256,
&avail)) == NULL || (size_t)avail <= used)
return (truncated_error(a));
if ((len = cab_strnlen(p + used, 255)) <= 0)
if ((len = cab_strnlen(p + used, avail - used - 1)) <= 0) {
goto invalid;
}
used += len + 1;
/* How many bytes are used for szDiskPrev. */
if ((p = __archive_read_ahead(a, used+256, NULL)) == NULL)
if ((p = cab_read_ahead_remaining(a, used + 256,
&avail)) == NULL || (size_t)avail <= used)
return (truncated_error(a));
if ((len = cab_strnlen(p + used, 255)) <= 0)
if ((len = cab_strnlen(p + used, avail - used - 1)) < 0)
goto invalid;
used += len + 1;
}
if (hd->flags & NEXT_CABINET) {
/* How many bytes are used for szCabinetNext. */
if ((p = __archive_read_ahead(a, used+256, NULL)) == NULL)
if ((p = cab_read_ahead_remaining(a, used + 256,
&avail)) == NULL || (size_t)avail <= used)
return (truncated_error(a));
if ((len = cab_strnlen(p + used, 255)) <= 0)
if ((len = cab_strnlen(p + used, avail - used - 1)) <= 0)
goto invalid;
used += len + 1;
/* How many bytes are used for szDiskNext. */
if ((p = __archive_read_ahead(a, used+256, NULL)) == NULL)
if ((p = cab_read_ahead_remaining(a, used + 256,
&avail)) == NULL || (size_t)avail <= used)
return (truncated_error(a));
if ((len = cab_strnlen(p + used, 255)) <= 0)
if ((len = cab_strnlen(p + used, avail - used - 1)) < 0)
goto invalid;
used += len + 1;
}
@@ -792,7 +797,6 @@ cab_read_header(struct archive_read *a)
prev_folder = -1;
for (i = 0; i < hd->file_count; i++) {
struct cffile *file = &(hd->file_array[i]);
ssize_t avail;
if ((p = __archive_read_ahead(a, 16, NULL)) == NULL)
return (truncated_error(a));
libarchive/test/CMakeLists.txt
+1
View File
@@ -125,6 +125,7 @@ IF(ENABLE_TEST)
test_read_format_cab_filename.c
test_read_format_cab_lzx_oob.c
test_read_format_cab_mszip_oob.c
test_read_format_cab_multi.c
test_read_format_cab_skip_malformed.c
test_read_format_cpio_afio.c
test_read_format_cpio_bin.c
libarchive/test/test_read_format_cab_multi.c
+72
View File
@@ -0,0 +1,72 @@
/*-
* Copyright (c) 2026 Tobias Stoeckmann
* 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"
DEFINE_TEST(test_read_format_cab_multi)
{
/* Reference to multi volume CAB files */
const char *refname1 = "test_read_format_cab_multi.p1.cab";
const char *refname2 = "test_read_format_cab_multi.p2.cab";
struct archive *a;
struct archive_entry *ae;
/* Extract the reference files into the test sandbox */
extract_reference_file(refname1);
extract_reference_file(refname2);
/* Initialize the archive reader for first part */
assert((a = archive_read_new()) != NULL);
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
assertEqualIntA(a, ARCHIVE_OK,
archive_read_open_filename(a, refname1, 10));
/* Read entry */
assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
assertEqualString(archive_entry_pathname(ae), "ones");
assertEqualInt(archive_entry_size(ae), 512);
/* Clean up reader */
assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
/* Initialize the archive reader for second part */
assert((a = archive_read_new()) != NULL);
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
assertEqualIntA(a, ARCHIVE_OK,
archive_read_open_filename(a, refname2, 10));
/* Read entry */
assertEqualIntA(a, ARCHIVE_WARN, archive_read_next_header(a, &ae));
assertEqualString(archive_entry_pathname(ae), "ones");
assertEqualInt(archive_entry_size(ae), 512);
/* Clean up reader */
assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
}
libarchive/test/test_read_format_cab_multi.p1.cab.uu
+15
View File
@@ -0,0 +1,15 @@
begin 644 test_read_format_cab_multi.p1.cab
M35-#1@```````@```````$\``````````P$!``$``@"U`0``=&5S=%]R96%D
M7V9O<FUA=%]C86)?;75L=&DN<#(N8V%B``!D`````0`````"````````_O_0
M7(6J(`!O;F5S`)4``0&4`0```0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
1`0$!`0$!`0$!`0$!`0$!`0$`
`
end
libarchive/test/test_read_format_cab_multi.p2.cab.uu
+8
View File
@@ -0,0 +1,8 @@
begin 644 test_read_format_cab_multi.p2.cab
M35-#1@````#8`````````$\``````````P$!``$``0"U`0$`=&5S=%]R96%D
M7V9O<FUA=%]C86)?;75L=&DN<#$N8V%B``!D`````0`````"````````_?_0
M7(6J(`!O;F5S`&T!`0-L```"`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
M`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
D`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!`0$!
`
end