break;
#ifdef WITH_NTFS_3G
case BLOB_IN_NTFS_VOLUME:
- if (old->ntfs_loc) {
- new->ntfs_loc = memdup(old->ntfs_loc,
- sizeof(struct ntfs_location));
- if (new->ntfs_loc == NULL)
- goto out_free;
- new->ntfs_loc->path = STRDUP(old->ntfs_loc->path);
- new->ntfs_loc->attr_name = NULL;
- if (new->ntfs_loc->path == NULL)
- goto out_free;
- if (new->ntfs_loc->attr_name_nchars != 0) {
- new->ntfs_loc->attr_name =
- utf16le_dup(old->ntfs_loc->attr_name);
- if (new->ntfs_loc->attr_name == NULL)
- goto out_free;
- }
- }
+ new->ntfs_loc = clone_ntfs_location(old->ntfs_loc);
+ if (!new->ntfs_loc)
+ goto out_free;
break;
#endif
}
break;
#ifdef WITH_NTFS_3G
case BLOB_IN_NTFS_VOLUME:
- if (blob->ntfs_loc) {
- FREE(blob->ntfs_loc->path);
- FREE(blob->ntfs_loc->attr_name);
- FREE(blob->ntfs_loc);
- }
+ if (blob->ntfs_loc)
+ free_ntfs_location(blob->ntfs_loc);
break;
#endif
- default:
- break;
}
}
v = (int)blob1->blob_location - (int)blob2->blob_location;
- /* Different resource locations? */
+ /* Different locations? */
if (v)
return v;
/* Different (possibly split) WIMs? */
if (wim1 != wim2) {
- v = memcmp(wim1->hdr.guid, wim2->hdr.guid, WIM_GUID_LEN);
+ v = cmp_guids(wim1->hdr.guid, wim2->hdr.guid);
if (v)
return v;
}
#ifdef __WIN32__
case BLOB_IN_WINNT_FILE_ON_DISK:
case BLOB_WIN32_ENCRYPTED:
+ /* Windows: compare by starting LCN (logical cluster number) */
+ v = cmp_u64(blob1->sort_key, blob2->sort_key);
+ if (v)
+ return v;
#endif
/* Compare files by path: just a heuristic that will place files
* in the same directory next to each other. */
return tstrcmp(blob1->file_on_disk, blob2->file_on_disk);
#ifdef WITH_NTFS_3G
case BLOB_IN_NTFS_VOLUME:
- return tstrcmp(blob1->ntfs_loc->path, blob2->ntfs_loc->path);
+ return cmp_ntfs_locations(blob1->ntfs_loc, blob2->ntfs_loc);
#endif
default:
/* No additional sorting order defined for this resource
rdesc = rdescs[i];
- wim_res_hdr_to_desc(&reshdr, wim, rdesc);
+ wim_reshdr_to_desc(&reshdr, wim, rdesc);
/* For solid resources, the uncompressed size, compression type,
* and chunk size are stored in the resource itself, not in the
struct blob_table *table = NULL;
struct blob_descriptor *cur_blob = NULL;
size_t num_duplicate_blobs = 0;
+ size_t num_empty_blobs = 0;
size_t num_wrong_part_blobs = 0;
u32 image_index = 0;
struct wim_resource_descriptor **cur_solid_rdescs = NULL;
goto out;
}
- /* How to handle an uncompressed resource with its
- * uncompressed size different from its compressed size?
- *
- * Based on a simple test, WIMGAPI seems to handle this
- * as follows:
- *
- * if (size_in_wim > uncompressed_size) {
- * Ignore uncompressed_size; use size_in_wim
- * instead.
- * } else {
- * Honor uncompressed_size, but treat the part of
- * the file data above size_in_wim as all zeros.
- * }
- *
- * So we will do the same. */
- if (unlikely(!(reshdr.flags &
- WIM_RESHDR_FLAG_COMPRESSED) &&
- (reshdr.size_in_wim >
- reshdr.uncompressed_size)))
+ if (unlikely(!(reshdr.flags & WIM_RESHDR_FLAG_COMPRESSED) &&
+ (reshdr.size_in_wim != reshdr.uncompressed_size)))
{
- reshdr.uncompressed_size = reshdr.size_in_wim;
+ ERROR("Uncompressed resource has "
+ "size_in_wim != uncompressed_size");
+ ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
+ goto out;
}
/* Set up a resource descriptor for this blob. */
if (!rdesc)
goto oom;
- wim_res_hdr_to_desc(&reshdr, wim, rdesc);
-
- blob_set_is_located_in_nonsolid_wim_resource(cur_blob, rdesc);
+ wim_reshdr_to_desc_and_blob(&reshdr, wim, rdesc, cur_blob);
}
/* cur_blob is now a blob bound to a resource. */
/* Ignore entries with all zeroes in the hash field. */
- if (is_zero_hash(cur_blob->hash))
+ if (unlikely(is_zero_hash(cur_blob->hash)))
goto free_cur_blob_and_continue;
+ /* Verify that the blob has nonzero size. */
+ if (unlikely(cur_blob->size == 0)) {
+ num_empty_blobs++;
+ goto free_cur_blob_and_continue;
+ }
+
/* Verify that the part number matches that of the underlying
* WIM file. */
- if (part_number != wim->hdr.part_number) {
+ if (unlikely(part_number != wim->hdr.part_number)) {
num_wrong_part_blobs++;
goto free_cur_blob_and_continue;
}
goto out;
}
+ if (reshdr.flags & WIM_RESHDR_FLAG_SOLID) {
+ ERROR("Image metadata in solid resources "
+ "is unsupported.");
+ ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
+ goto out;
+ }
+
if (wim->hdr.part_number != 1) {
WARNING("Ignoring metadata resource found in a "
"non-first part of the split WIM");
if (num_duplicate_blobs > 0)
WARNING("Ignoring %zu duplicate blobs", num_duplicate_blobs);
+ if (num_empty_blobs > 0)
+ WARNING("Ignoring %zu empty blobs", num_empty_blobs);
+
if (num_wrong_part_blobs > 0) {
WARNING("Ignoring %zu blobs with wrong part number",
num_wrong_part_blobs);
git://wimlib.net / wimlib / blobdiff