X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fmetadata_resource.c;h=5f392e52dbc15123f65c58c9ae3b657938b4b9bd;hp=13ebf51ff6611dc2ddcc854153d3487abae944de;hb=fced769402ff6ef0bf75fe9e4dcb2880891469e0;hpb=30ba1eb06caca0b20a47d8dd75a117c82d730da7

diff --git a/src/metadata_resource.c b/src/metadata_resource.c
index 13ebf51f..5f392e52 100644
--- a/src/metadata_resource.c
+++ b/src/metadata_resource.c
@@ -59,6 +59,9 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	struct wim_dentry *root;
 	const struct wim_lookup_table_entry *metadata_lte;
 	u64 metadata_len;
+	u8 hash[SHA1_HASH_SIZE];
+	struct wim_security_data *security_data;
+	struct wim_inode *inode;
 
 	metadata_lte = imd->metadata_lte;
 	metadata_len = wim_resource_size(metadata_lte);
@@ -99,6 +102,13 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	if (ret)
 		goto out_free_buf;
 
+	sha1_buffer(buf, metadata_len, 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;
+	}
+
 	DEBUG("Finished reading metadata resource into memory.");
 
 	/* The root directory entry starts after security data, aligned on an
@@ -113,7 +123,7 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	 * and calculate the offset in the metadata resource of the root dentry.
 	 * */
 
-	ret = read_wim_security_data(buf, metadata_len, &imd->security_data);
+	ret = read_wim_security_data(buf, metadata_len, &security_data);
 	if (ret)
 		goto out_free_buf;
 
@@ -127,11 +137,14 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	}
 
 	ret = read_dentry(buf, metadata_len,
-			  imd->security_data->total_length, root);
+			  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) {
@@ -139,6 +152,16 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 		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;
 
@@ -155,26 +178,24 @@ read_metadata_resource(WIMStruct *wim, struct wim_image_metadata *imd)
 	if (ret)
 		goto out_free_dentry_tree;
 
-	if (!wim->all_images_verified) {
-		/* Note: verify_dentry() expects to access imd->security_data,
-		 * so it needs to be set before here. */
-		DEBUG("Running miscellaneous verifications on the dentry tree");
-		for_lookup_table_entry(wim->lookup_table, lte_zero_real_refcnt, NULL);
-		ret = for_dentry_in_tree(root, verify_dentry, wim);
+
+	DEBUG("Running miscellaneous verifications on the dentry tree");
+	image_for_each_inode(inode, imd) {
+		ret = verify_inode(inode, security_data);
 		if (ret)
 			goto out_free_dentry_tree;
 	}
-
 	DEBUG("Done reading image metadata");
-
+out_success:
 	imd->root_dentry = root;
+	imd->security_data = security_data;
 	INIT_LIST_HEAD(&imd->unhashed_streams);
+	ret = 0;
 	goto out_free_buf;
 out_free_dentry_tree:
 	free_dentry_tree(root, wim->lookup_table);
 out_free_security_data:
-	free_wim_security_data(imd->security_data);
-	imd->security_data = NULL;
+	free_wim_security_data(security_data);
 out_free_buf:
 	FREE(buf);
 	return ret;