goto out_free_buf;
sha1_buffer(buf, metadata_len, hash);
- if (!hashes_equal(metadata_lte->hash, hash))
- {
+ if (!hashes_equal(metadata_lte->hash, hash)) {
ERROR("Metadata resource is corrupted (invalid SHA-1 message digest)!");
ret = WIMLIB_ERR_INVALID_RESOURCE_HASH;
goto out_free_buf;
imd->security_data->total_length, root);
if (ret == 0 && root->length == 0) {
- ERROR("Metadata resource cannot begin with end-of-directory entry!");
- ret = WIMLIB_ERR_INVALID_DENTRY;
+ WARNING("Metadata resource begins with end-of-directory entry "
+ "(treating as empty image)");
+ FREE(root);
+ root = NULL;
+ goto out_success;
}
if (ret) {
goto out_free_security_data;
}
+ if (dentry_has_long_name(root) || dentry_has_short_name(root)) {
+ WARNING("The root directory has a nonempty name (removing it)");
+ FREE(root->file_name);
+ FREE(root->short_name);
+ root->file_name = NULL;
+ root->short_name = NULL;
+ root->file_name_nbytes = 0;
+ root->short_name_nbytes = 0;
+ }
+
/* This is the root dentry, so set its parent to itself. */
root->parent = root;
DEBUG("Done reading image metadata");
+out_success:
imd->root_dentry = root;
INIT_LIST_HEAD(&imd->unhashed_streams);
goto out_free_buf;