X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fverify.c;h=62e9547e0e4f947d231fd3920a2a0d7bae530301;hp=166a9e88ed710bbef852edc44388fd62e780a4ca;hb=16176f3b7ce78da85646e814bd2f3ffe5babb82b;hpb=49f2ae12d9940ab43f9a6df793facb1d8dddf5ea diff --git a/src/verify.c b/src/verify.c index 166a9e88..62e9547e 100644 --- a/src/verify.c +++ b/src/verify.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * wimlib - Library for working with WIM files * @@ -43,21 +43,21 @@ static int verify_inode(struct wim_inode *inode, const WIMStruct *w) * image's security descriptors table. */ if (inode->i_security_id < -1) { ERROR("Dentry `%s' has an invalid security ID (%d)", - first_dentry->full_path_utf8, inode->i_security_id); + first_dentry->full_path, inode->i_security_id); goto out; } if (inode->i_security_id >= sd->num_entries) { ERROR("Dentry `%s' has an invalid security ID (%d) " "(there are only %u entries in the security table)", - first_dentry->full_path_utf8, inode->i_security_id, - sd->num_entries); + first_dentry->full_path, inode->i_security_id, + sd->num_entries); goto out; } /* Check that lookup table entries for all the inode's stream exist, * except if the SHA1 message digest is all 0's, which indicates an - * empty stream. + * empty stream. * * This check is skipped on split WIMs. */ if (w->hdr.total_parts == 1) { @@ -68,7 +68,7 @@ static int verify_inode(struct wim_inode *inode, const WIMStruct *w) lte = __lookup_resource(table, hash); if (!lte && !is_zero_hash(hash)) { ERROR("Could not find lookup table entry for stream " - "%u of dentry `%s'", i, first_dentry->full_path_utf8); + "%u of dentry `%s'", i, first_dentry->full_path); goto out; } if (lte) @@ -119,39 +119,36 @@ static int verify_inode(struct wim_inode *inode, const WIMStruct *w) for (unsigned i = 0; i <= inode->i_num_ads; i++) { const u8 *hash; hash = inode_stream_hash_unresolved(inode, i); - if (inode_stream_name_len(inode, i) == 0 && !is_zero_hash(hash)) + if (inode_stream_name_nbytes(inode, i) == 0 && !is_zero_hash(hash)) num_unnamed_streams++; } if (num_unnamed_streams > 1) { ERROR("Dentry `%s' has multiple (%u) un-named streams", - first_dentry->full_path_utf8, num_unnamed_streams); + first_dentry->full_path, num_unnamed_streams); goto out; } - /* Currently ignoring this test because wimlib does not apply DOS names - * to a file with hard links (see apply_dentry_ntfs()). */ -#if 0 /* Files cannot have multiple DOS names, even if they have multiple - * names in multiple directories (i.e. hard links) ??? XXX */ + * names in multiple directories (i.e. hard links). + * Source: NTFS-3g authors. */ const struct wim_dentry *dentry_with_dos_name = NULL; inode_for_each_dentry(dentry, inode) { - if (dentry->short_name_len) { + if (dentry_has_short_name(dentry)) { if (dentry_with_dos_name) { ERROR("Hard-linked file has a DOS name at " "both `%s' and `%s'", - dentry_with_dos_name->full_path_utf8, - dentry->full_path_utf8); + dentry_with_dos_name->full_path, + dentry->full_path); goto out; } dentry_with_dos_name = dentry; } } -#endif /* Directories with multiple links have not been tested. XXX */ if (inode->i_nlink > 1 && inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) { ERROR("Hard-linked directory `%s' is unsupported", - first_dentry->full_path_utf8); + first_dentry->full_path); goto out; } @@ -177,17 +174,19 @@ int verify_dentry(struct wim_dentry *dentry, void *wim) /* Make sure root dentry is unnamed, while every other dentry has at * least a long name. * - * XXX Files having only a DOS name may be acceptable. */ + * I am assuming that dentries having only a DOS name is illegal; i.e., + * Windows will always combine the Win32 name and DOS name for a file + * into a single WIM dentry, even if they are stored separately on NTFS. + * (This seems to be the case...) */ if (dentry_is_root(dentry)) { - if (dentry->file_name_len || dentry->short_name_len) { - ERROR("The root dentry is named `%s', but it must " - "be unnamed", dentry->file_name_utf8); + if (dentry_has_long_name(dentry) || dentry_has_short_name(dentry)) { + ERROR("The root dentry has a nonempty name!"); return WIMLIB_ERR_INVALID_DENTRY; } } else { - if (!dentry->file_name_len) { - ERROR("Dentry `%s' has no long name", - dentry->full_path_utf8); + if (!dentry_has_long_name(dentry)) { + ERROR("Dentry `%s' has no long name!", + dentry->full_path); return WIMLIB_ERR_INVALID_DENTRY; } } @@ -212,11 +211,13 @@ static int image_run_full_verifications(WIMStruct *w) static int lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr) { if (lte->refcnt != lte->real_refcnt) { + #ifdef ENABLE_ERROR_MESSAGES WARNING("The following lookup table entry has a reference " "count of %u, but", lte->refcnt); WARNING("We found %u references to it", lte->real_refcnt); - print_lookup_table_entry(lte); + print_lookup_table_entry(lte, stderr); + #endif lte->refcnt = lte->real_refcnt; ++*(unsigned long *)ctr; } @@ -312,48 +313,54 @@ int verify_swm_set(WIMStruct *w, WIMStruct **additional_swms, ctype = wimlib_get_compression_type(w); guid = w->hdr.guid; - WIMStruct *parts_to_swms[num_additional_swms]; - ZERO_ARRAY(parts_to_swms); - for (unsigned i = 0; i < num_additional_swms; i++) { + { + /* parts_to_swms is not allocated at function scope because it + * should only be allocated after num_additional_swms was + * checked to be the same as w->hdr.total_parts. Otherwise, it + * could be unexpectedly high and cause a stack overflow. */ + WIMStruct *parts_to_swms[num_additional_swms]; + ZERO_ARRAY(parts_to_swms); + for (unsigned i = 0; i < num_additional_swms; i++) { - WIMStruct *swm = additional_swms[i]; + WIMStruct *swm = additional_swms[i]; - if (wimlib_get_compression_type(swm) != ctype) { - ERROR("The split WIMs do not all have the same " - "compression type"); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) { - ERROR("The split WIMs do not all have the same " - "GUID"); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (swm->hdr.part_number == 1) { - ERROR("WIMs `%s' and `%s' both are marked as the " - "first WIM in the spanned set", - w->filename, swm->filename); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (swm->hdr.part_number == 0 || - swm->hdr.part_number > total_parts) - { - ERROR("WIM `%s' says it is part %u in the spanned set, " - "but the part number must be in the range " - "[1, %u]", - swm->filename, swm->hdr.part_number, total_parts); - return WIMLIB_ERR_SPLIT_INVALID; - } - if (parts_to_swms[swm->hdr.part_number - 2]) - { - ERROR("`%s' and `%s' are both marked as part %u of %u " - "in the spanned set", - parts_to_swms[swm->hdr.part_number - 2]->filename, - swm->filename, - swm->hdr.part_number, - total_parts); - return WIMLIB_ERR_SPLIT_INVALID; - } else { - parts_to_swms[swm->hdr.part_number - 2] = swm; + if (wimlib_get_compression_type(swm) != ctype) { + ERROR("The split WIMs do not all have the same " + "compression type"); + return WIMLIB_ERR_SPLIT_INVALID; + } + if (memcmp(guid, swm->hdr.guid, WIM_GID_LEN) != 0) { + ERROR("The split WIMs do not all have the same " + "GUID"); + return WIMLIB_ERR_SPLIT_INVALID; + } + if (swm->hdr.part_number == 1) { + ERROR("WIMs `%s' and `%s' both are marked as the " + "first WIM in the spanned set", + w->filename, swm->filename); + return WIMLIB_ERR_SPLIT_INVALID; + } + if (swm->hdr.part_number == 0 || + swm->hdr.part_number > total_parts) + { + ERROR("WIM `%s' says it is part %u in the spanned set, " + "but the part number must be in the range " + "[1, %u]", + swm->filename, swm->hdr.part_number, total_parts); + return WIMLIB_ERR_SPLIT_INVALID; + } + if (parts_to_swms[swm->hdr.part_number - 2]) + { + ERROR("`%s' and `%s' are both marked as part %u of %u " + "in the spanned set", + parts_to_swms[swm->hdr.part_number - 2]->filename, + swm->filename, + swm->hdr.part_number, + total_parts); + return WIMLIB_ERR_SPLIT_INVALID; + } else { + parts_to_swms[swm->hdr.part_number - 2] = swm; + } } } return 0;