X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fjoin.c;h=cca44214041ab6c9fabefd269d59db95e7cfef8e;hb=7a3c99e3ea8add3fe2eaca37cb53ba4c61500d28;hp=da4ac406ec70226bf8975821eb4937bc425eeb53;hpb=3071e89c11d1be71cf45b694432e5908e0c4ded9;p=wimlib

diff --git a/src/join.c b/src/join.c
index da4ac406..cca44214 100644
--- a/src/join.c
+++ b/src/join.c
@@ -94,7 +94,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 		 * checked to be the same as wim->hdr.total_parts.  Otherwise, it
 		 * could be unexpectedly high and cause a stack overflow. */
 		WIMStruct *parts_to_swms[num_additional_swms];
-		ZERO_ARRAY(parts_to_swms);
+		memset(parts_to_swms, 0, sizeof(parts_to_swms));
 		for (unsigned i = 0; i < num_additional_swms; i++) {
 
 			WIMStruct *swm = additional_swms[i];
@@ -110,7 +110,7 @@ verify_swm_set(WIMStruct *wim, WIMStruct **additional_swms,
 				      "chunk size");
 				return WIMLIB_ERR_SPLIT_INVALID;
 			}
-			if (memcmp(guid, swm->hdr.guid, WIM_GUID_LEN) != 0) {
+			if (!guids_equal(guid, swm->hdr.guid)) {
 				ERROR("The split WIMs do not all have the same "
 				      "GUID");
 				return WIMLIB_ERR_SPLIT_INVALID;