From 67b6e421c8018a894f38eee258dbc03510137254 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 13 Dec 2013 12:43:37 -0600 Subject: [PATCH] verify_swm_set(): Check chunk size --- src/join.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/join.c b/src/join.c index cdfd3889..19049353 100644 --- a/src/join.c +++ b/src/join.c @@ -56,6 +56,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms, { unsigned total_parts = wim->hdr.total_parts; int ctype; + u32 chunk_size; const u8 *guid; if (total_parts != num_additional_swms + 1) { @@ -83,9 +84,10 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms, } } - /* keep track of ctype and guid just to make sure they are the same for - * all the WIMs. */ + /* Keep track of the compression type, chunk size, and GUID to make sure + * they are the same for all the WIMs. */ ctype = wim->compression_type; + chunk_size = wim->chunk_size; guid = wim->hdr.guid; { @@ -104,6 +106,12 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms, "compression type"); return WIMLIB_ERR_SPLIT_INVALID; } + if (swm->chunk_size != chunk_size && + ctype != WIMLIB_COMPRESSION_TYPE_NONE) { + ERROR("The split WIMs do not all have the same " + "chunk size"); + return WIMLIB_ERR_SPLIT_INVALID; + } if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) { ERROR("The split WIMs do not all have the same " "GUID"); -- 2.43.0