X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fheader.c;h=3d60138339e527c8d9383da3330170625e5cc618;hp=2a7fe32b5fbaac0318b83d6937b5c2349dcd0d91;hb=8c12fe7d77c39dcc53df1c60ab227bb6156fb171;hpb=9b9a502863318d6208da2818b1d522346e5eee9e

diff --git a/src/header.c b/src/header.c
index 2a7fe32b..3d601383 100644
--- a/src/header.c
+++ b/src/header.c
@@ -5,7 +5,6 @@
  */
 
 /*
- * Copyright (C) 2010 Carl Thijssen
  * Copyright (C) 2012 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
@@ -25,7 +24,8 @@
  */
 
 #include "wimlib_internal.h"
-#include "io.h"
+#include "buffer_io.h"
+#include <limits.h>
 
 /* First 8 bytes in every WIM file. */
 static const u8 wim_magic_chars[WIM_MAGIC_LEN] = {
@@ -104,8 +104,17 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
 	p = get_u16(p, &hdr->part_number);
 	p = get_u16(p, &hdr->total_parts);
 
-	if (!(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK)
-	    && (hdr->part_number != 1 || hdr->total_parts != 1))
+	if (hdr->total_parts == 0 ||
+	    hdr->part_number == 0 ||
+	    hdr->part_number > hdr->total_parts)
+	{
+		ERROR("Invalid WIM part number: %hu of %hu",
+		      hdr->part_number, hdr->total_parts);
+		return WIMLIB_ERR_INVALID_PART_NUMBER;
+	}
+
+	if (!(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK) &&
+	    hdr->total_parts != 1)
 	{
 		ERROR("This WIM is part %u of a %u-part WIM",
 		      hdr->part_number, hdr->total_parts);
@@ -117,6 +126,11 @@ int read_header(FILE *fp, struct wim_header *hdr, int open_flags)
 	DEBUG("part_number = %u, total_parts = %u, image_count = %u",
 	      hdr->part_number, hdr->total_parts, hdr->image_count);
 
+	if (hdr->image_count >= INT_MAX) {
+		ERROR("Invalid image count (%u)", hdr->image_count);
+		return WIMLIB_ERR_IMAGE_COUNT;
+	}
+
 	/* Byte 48 */
 
 	p = get_resource_entry(p, &hdr->lookup_table_res_entry);
@@ -240,14 +254,13 @@ struct hdr_flag hdr_flags[] = {
 WIMLIBAPI void wimlib_print_header(const WIMStruct *w)
 {
 	const struct wim_header *hdr = &w->hdr;
-	uint i;
 
 	printf("Magic Characters            = MSWIM\\000\\000\\000\n");
 	printf("Header Size                 = %u\n", WIM_HEADER_DISK_SIZE);
 	printf("Version                     = 0x%x\n", WIM_VERSION);
 
 	printf("Flags                       = 0x%x\n", hdr->flags);
-	for (i = 0; i < ARRAY_LEN(hdr_flags); i++)
+	for (size_t i = 0; i < ARRAY_LEN(hdr_flags); i++)
 		if (hdr_flags[i].flag & hdr->flags)
 			printf("    WIM_HDR_FLAG_%s is set\n", hdr_flags[i].name);