X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Ffuse-exfat.git;a=blobdiff_plain;f=libexfat%2Fnode.c;fp=libexfat%2Fnode.c;h=88b1357189c2f3ac2aed6e7bda3550074e437736;hp=9cffbcb8a68cfc36da6965560578ddb0cc1d6c4c;hb=aa03032454625361e1abc1cf80f4db0492ae5b81;hpb=b8b3f5e8940dd7a0ce964dfecd8c6c6139dab421

diff --git a/libexfat/node.c b/libexfat/node.c
index 9cffbcb..88b1357 100644
--- a/libexfat/node.c
+++ b/libexfat/node.c
@@ -3,7 +3,7 @@
 	exFAT file system implementation library.
 
 	Free exFAT implementation.
-	Copyright (C) 2010-2018  Andrew Nayenko
+	Copyright (C) 2010-2023  Andrew Nayenko
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -144,6 +144,7 @@ static void init_node_meta1(struct exfat_node* node,
 static void init_node_meta2(struct exfat_node* node,
 		const struct exfat_entry_meta2* meta2)
 {
+	node->valid_size = le64_to_cpu(meta2->valid_size);
 	node->size = le64_to_cpu(meta2->size);
 	node->start_cluster = le32_to_cpu(meta2->start_cluster);
 	node->fptr_cluster = node->start_cluster;
@@ -206,8 +207,7 @@ static bool check_entries(const struct exfat_entry* entry, int n)
 }
 
 static bool check_node(const struct exfat* ef, struct exfat_node* node,
-		le16_t actual_checksum, const struct exfat_entry_meta1* meta1,
-		const struct exfat_entry_meta2* meta2)
+		le16_t actual_checksum, const struct exfat_entry_meta1* meta1)
 {
 	int cluster_size = CLUSTER_SIZE(*ef->sb);
 	uint64_t clusters_heap_size =
@@ -234,12 +234,11 @@ static bool check_node(const struct exfat* ef, struct exfat_node* node,
 	   cannot be greater than file size. See SetFileValidData() function
 	   description in MSDN.
 	*/
-	if (le64_to_cpu(meta2->valid_size) > node->size)
+	if (node->valid_size > node->size)
 	{
 		exfat_get_name(node, buffer);
 		exfat_error("'%s' has valid size (%"PRIu64") greater than size "
-				"(%"PRIu64")", buffer, le64_to_cpu(meta2->valid_size),
-				node->size);
+				"(%"PRIu64")", buffer, node->valid_size, node->size);
 		ret = false;
 	}
 
@@ -328,7 +327,7 @@ static int parse_file_entries(struct exfat* ef, struct exfat_node* node,
 	init_node_meta2(node, meta2);
 	init_node_name(node, entries + 2, mandatory_entries - 2);
 
-	if (!check_node(ef, node, exfat_calc_checksum(entries, n), meta1, meta2))
+	if (!check_node(ef, node, exfat_calc_checksum(entries, n), meta1))
 		return -EIO;
 
 	return 0;
@@ -659,7 +658,8 @@ int exfat_flush_node(struct exfat* ef, struct exfat_node* node)
 			NULL, &meta1->atime_tzo);
 	meta1->adate = edate;
 	meta1->atime = etime;
-	meta2->size = meta2->valid_size = cpu_to_le64(node->size);
+	meta2->valid_size = cpu_to_le64(node->valid_size);
+	meta2->size = cpu_to_le64(node->size);
 	meta2->start_cluster = cpu_to_le32(node->start_cluster);
 	meta2->flags = EXFAT_FLAG_ALWAYS1;
 	/* empty files must not be marked as contiguous */
@@ -1128,7 +1128,7 @@ int exfat_rename(struct exfat* ef, const char* old_path, const char* new_path)
 			exfat_put_node(ef, existing);
 			if (rc != 0)
 			{
-				/* free clusters even if something went wrong; overwise they
+				/* free clusters even if something went wrong; otherwise they
 				   will be just lost */
 				exfat_cleanup_node(ef, existing);
 				exfat_put_node(ef, dir);