X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Flookup_table.c;h=3d66ca18246be543cb63037d34af60989a0cb1f8;hp=941ad813e52890b3d1fdc53dc5eaac278e06fcd5;hb=79b64b516e5bdb486832f88788362dbe9deb1b61;hpb=5046b052366414f09940041ad79244c320d24751

diff --git a/src/lookup_table.c b/src/lookup_table.c
index 941ad813..3d66ca18 100644
--- a/src/lookup_table.c
+++ b/src/lookup_table.c
@@ -59,17 +59,16 @@ err:
 struct lookup_table_entry *new_lookup_table_entry()
 {
 	struct lookup_table_entry *lte;
-	
+
 	lte = CALLOC(1, sizeof(struct lookup_table_entry));
-	if (!lte) {
+	if (lte) {
+		lte->part_number  = 1;
+		lte->refcnt       = 1;
+	} else {
 		ERROR("Out of memory (tried to allocate %zu bytes for "
 		      "lookup table entry)",
 		      sizeof(struct lookup_table_entry));
-		return NULL;
 	}
-
-	lte->part_number  = 1;
-	lte->refcnt       = 1;
 	return lte;
 }
 
@@ -186,7 +185,7 @@ void free_lookup_table(struct lookup_table *table)
  * @table:	A pointer to the lookup table.
  * @entry:	A pointer to the entry to insert.
  */
-void lookup_table_insert(struct lookup_table *table, 
+void lookup_table_insert(struct lookup_table *table,
 			 struct lookup_table_entry *lte)
 {
 	size_t i = lte->hash_short % table->capacity;
@@ -238,11 +237,11 @@ void lte_decrement_num_opened_fds(struct lookup_table_entry *lte,
 }
 #endif
 
-/* 
+/*
  * Calls a function on all the entries in the lookup table.  Stop early and
  * return nonzero if any call to the function returns nonzero.
  */
-int for_lookup_table_entry(struct lookup_table *table, 
+int for_lookup_table_entry(struct lookup_table *table,
 			   int (*visitor)(struct lookup_table_entry *, void *),
 			   void *arg)
 {
@@ -278,7 +277,8 @@ int read_lookup_table(WIMStruct *w)
 	      w->hdr.lookup_table_res_entry.offset,
 	      w->hdr.lookup_table_res_entry.original_size);
 
-	if (fseeko(w->fp, w->hdr.lookup_table_res_entry.offset, SEEK_SET) != 0) {
+	if (fseeko(w->fp, w->hdr.lookup_table_res_entry.offset, SEEK_SET) != 0)
+	{
 		ERROR_WITH_ERRNO("Failed to seek to byte %"PRIu64" to read "
 				 "lookup table",
 				 w->hdr.lookup_table_res_entry.offset);
@@ -311,7 +311,7 @@ int read_lookup_table(WIMStruct *w)
 		}
 		cur_entry->wim = w;
 		cur_entry->resource_location = RESOURCE_IN_WIM;
-			 
+
 		p = get_resource_entry(buf, &cur_entry->resource_entry);
 		p = get_u16(p, &cur_entry->part_number);
 		p = get_u32(p, &cur_entry->refcnt);
@@ -323,7 +323,6 @@ int read_lookup_table(WIMStruct *w)
 			      w->hdr.part_number, cur_entry->part_number);
 			ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
 			goto out_free_cur_entry;
-			
 		}
 
 		if (is_zero_hash(cur_entry->hash)) {
@@ -333,8 +332,15 @@ int read_lookup_table(WIMStruct *w)
 			goto out_free_cur_entry;
 		}
 
+		/* Ordinarily, no two streams should share the same SHA1 message
+		 * digest.  However, this constraint can be broken for metadata
+		 * resources--- two identical images will have the same metadata
+		 * resource, but their lookup table entries are not shared. */
 		duplicate_entry = __lookup_resource(table, cur_entry->hash);
-		if (duplicate_entry) {
+		if (duplicate_entry
+		    && !((duplicate_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA)
+			  && cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_METADATA))
+		{
 			ERROR("The WIM lookup table contains two entries with the "
 			      "same SHA1 message digest!");
 			ERROR("The first entry is:");
@@ -347,7 +353,7 @@ int read_lookup_table(WIMStruct *w)
 
 		if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
 		    && (cur_entry->resource_entry.size !=
-		      cur_entry->resource_entry.original_size))
+		        cur_entry->resource_entry.original_size))
 		{
 			ERROR("Found uncompressed resource with original size "
 			      "not the same as compressed size");
@@ -370,7 +376,7 @@ out:
 }
 
 
-/* 
+/*
  * Writes a lookup table entry to the output file.
  */
 int write_lookup_table_entry(struct lookup_table_entry *lte, void *__out)
@@ -427,11 +433,11 @@ void print_lookup_table_entry(const struct lookup_table_entry *lte)
 		putchar('\n');
 		return;
 	}
-	printf("Offset            = %"PRIu64" bytes\n", 
+	printf("Offset            = %"PRIu64" bytes\n",
 	       lte->resource_entry.offset);
-	printf("Size              = %"PRIu64" bytes\n", 
+	printf("Size              = %"PRIu64" bytes\n",
 	       (u64)lte->resource_entry.size);
-	printf("Original size     = %"PRIu64" bytes\n", 
+	printf("Original size     = %"PRIu64" bytes\n",
 	       lte->resource_entry.original_size);
 	printf("Part Number       = %hu\n", lte->part_number);
 	printf("Reference Count   = %u\n", lte->refcnt);
@@ -476,16 +482,16 @@ static int do_print_lookup_table_entry(struct lookup_table_entry *lte,
 }
 
 /*
- * Prints the lookup table of a WIM file. 
+ * Prints the lookup table of a WIM file.
  */
 WIMLIBAPI void wimlib_print_lookup_table(WIMStruct *w)
 {
-	for_lookup_table_entry(w->lookup_table, 
+	for_lookup_table_entry(w->lookup_table,
 			       do_print_lookup_table_entry,
 			       NULL);
 }
 
-/* 
+/*
  * Looks up an entry in the lookup table.
  */
 struct lookup_table_entry *
@@ -495,7 +501,8 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[])
 	struct lookup_table_entry *lte;
 	struct hlist_node *pos;
 
-	wimlib_assert(table);
+	wimlib_assert(table != NULL);
+	wimlib_assert(hash != NULL);
 
 	i = *(size_t*)hash % table->capacity;
 	hlist_for_each_entry(lte, pos, &table->array[i], hash_list)
@@ -505,7 +512,7 @@ __lookup_resource(const struct lookup_table *table, const u8 hash[])
 }
 
 #ifdef WITH_FUSE
-/* 
+/*
  * Finds the dentry, lookup table entry, and stream index for a WIM file stream,
  * given a path name.
  *
@@ -610,7 +617,7 @@ static void inode_unresolve_ltes(struct inode *inode)
 	inode->resolved = false;
 }
 
-/* Resolve a dentry's lookup table entries 
+/* Resolve a dentry's lookup table entries
  *
  * This replaces the SHA1 hash fields (which are used to lookup an entry in the
  * lookup table) with pointers directly to the lookup table entries.  A circular