X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fheader.c;h=e223ce9fa291f1e3756fa0eae2c400cadf1c6996;hp=30b2b13204abc8dd6fd0a1bd3df6511711876584;hb=32614c9f026be20f0336df3053b91090dc53297f;hpb=2d14d2982e057b2d99128c20c9768985bdfcd0a0

diff --git a/src/header.c b/src/header.c
index 30b2b132..e223ce9f 100644
--- a/src/header.c
+++ b/src/header.c
@@ -96,7 +96,9 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 			/* Pipable WIM:  Use header at end instead, unless
 			 * actually reading from a pipe.  */
 			if (!in_fd->is_pipe) {
-				lseek(in_fd->fd, -WIM_HEADER_DISK_SIZE, SEEK_END);
+				ret = WIMLIB_ERR_READ;
+				if (-1 == lseek(in_fd->fd, -WIM_HEADER_DISK_SIZE, SEEK_END))
+					goto read_error;
 				ret = full_read(in_fd, &disk_hdr, sizeof(disk_hdr));
 				if (ret)
 					goto read_error;
@@ -141,7 +143,7 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 	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) {
+	if (unlikely(hdr->image_count > MAX_IMAGES)) {
 		ERROR("\"%"TS"\": Invalid image count (%u)",
 		      filename, hdr->image_count);
 		return WIMLIB_ERR_IMAGE_COUNT;