* This file is part of wimlib, a library for working with WIM files.
*
* wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
* any later version.
*
* wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
case RESOURCE_IN_STAGING_FILE:
case RESOURCE_IN_ATTACHED_BUFFER:
case RESOURCE_IN_FILE_ON_DISK:
- wimlib_assert((<e->file_on_disk ==
- <e->staging_file_name)
- && (<e->file_on_disk ==
- <e->attached_buffer));
+ wimlib_assert(((void*)<e->file_on_disk ==
+ (void*)<e->staging_file_name)
+ && ((void*)<e->file_on_disk ==
+ (void*)<e->attached_buffer));
FREE(lte->file_on_disk);
break;
#ifdef WITH_NTFS_3G
void free_lookup_table(struct lookup_table *table)
{
- DEBUG("Freeing lookup table");
+ DEBUG2("Freeing lookup table");
if (table) {
if (table->array) {
for_lookup_table_entry(table,
u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE];
int ret;
struct lookup_table *table;
+ struct lookup_table_entry *cur_entry = NULL, *duplicate_entry;
DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"",
w->hdr.lookup_table_res_entry.offset,
while (num_entries--) {
const u8 *p;
- struct lookup_table_entry *cur_entry, *duplicate_entry;
if (fread(buf, 1, sizeof(buf), w->fp) != sizeof(buf)) {
if (feof(w->fp)) {
p = get_u32(p, &cur_entry->refcnt);
p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash);
+ if (cur_entry->part_number != w->hdr.part_number) {
+ ERROR("A lookup table entry in part %hu of the WIM "
+ "points to part %hu",
+ 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)) {
ERROR("The WIM lookup table contains an entry with a "
"SHA1 message digest of all 0's");
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- FREE(cur_entry);
- goto out;
+ goto out_free_cur_entry;
}
duplicate_entry = __lookup_resource(table, cur_entry->hash);
ERROR("The second entry is:");
print_lookup_table_entry(cur_entry);
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- FREE(cur_entry);
- goto out;
+ goto out_free_cur_entry;
}
- lookup_table_insert(table, cur_entry);
if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
&& (cur_entry->resource_entry.size !=
ERROR("The lookup table entry for the resource is as follows:");
print_lookup_table_entry(cur_entry);
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- goto out;
+ goto out_free_cur_entry;
}
+ lookup_table_insert(table, cur_entry);
+
}
DEBUG("Done reading lookup table.");
w->lookup_table = table;
return 0;
+out_free_cur_entry:
+ FREE(cur_entry);
out:
free_lookup_table(table);
return ret;