* Reads the header from a WIM file.
*
* @wim
- * WIM to read the header from; @wim->in_fd must be positioned at the
- * offset at which to read the header.
+ * WIM to read the header from. @wim->in_fd must be positioned at the
+ * beginning of the file.
*
* @hdr
* Structure to read the header into.
if (hdr->wim_version != WIM_VERSION_DEFAULT &&
hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
{
- ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
+ ERROR("\"%"TS"\": Unknown WIM version: %u",
+ filename, hdr->wim_version);
return WIMLIB_ERR_UNKNOWN_VERSION;
}
hdr->flags = le32_to_cpu(disk_hdr.wim_flags);
hdr->chunk_size = le32_to_cpu(disk_hdr.chunk_size);
- memcpy(hdr->guid, disk_hdr.guid, WIM_GID_LEN);
+ memcpy(hdr->guid, disk_hdr.guid, WIM_GUID_LEN);
hdr->part_number = le16_to_cpu(disk_hdr.part_number);
hdr->total_parts = le16_to_cpu(disk_hdr.total_parts);
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;
disk_hdr.chunk_size = cpu_to_le32(hdr->chunk_size);
else
disk_hdr.chunk_size = 0;
- memcpy(disk_hdr.guid, hdr->guid, WIM_GID_LEN);
+ memcpy(disk_hdr.guid, hdr->guid, WIM_GUID_LEN);
disk_hdr.part_number = cpu_to_le16(hdr->part_number);
disk_hdr.total_parts = cpu_to_le16(hdr->total_parts);
tprintf(T("Chunk Size = %u\n"), hdr->chunk_size);
tfputs (T("GUID = "), stdout);
- print_byte_field(hdr->guid, WIM_GID_LEN, stdout);
+ print_byte_field(hdr->guid, WIM_GUID_LEN, stdout);
tputchar(T('\n'));
tprintf(T("Part Number = %hu\n"), hdr->part_number);
tprintf(T("Total Parts = %hu\n"), hdr->total_parts);