win32_apply: Stricter checks of resource format for WOF external backing

[wimlib] / src / ntfs-3g_apply.c

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index 5833d0419616e1bf53920d9ebb11c4bd2d14d3c9..690c2207708f9d6cfc32a92650801d1f87571fbd 100644 (file)
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -124,7 +124,10 @@ sid_size(const wimlib_SID *sid)
 static u8 *
 sd_fixup(const u8 *_desc, size_t *size_p)
 {
-       u32 owner_offset, group_offset, dacl_offset, sacl_offset;
+       u32 owner_offset, group_offset, dacl_offset;
+#if !defined(HAVE_NTFS_MNT_RDONLY)
+       u32 sacl_offset;
+#endif
        bool owner_valid, group_valid;
        size_t size = *size_p;
        const wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc =
@@ -141,10 +144,12 @@ sd_fixup(const u8 *_desc, size_t *size_p)
        else
                dacl_offset = 0;
 
+#if !defined(HAVE_NTFS_MNT_RDONLY)
        if (le16_to_cpu(desc->control) & wimlib_SE_SACL_PRESENT)
                sacl_offset = le32_to_cpu(desc->sacl_offset);
        else
                sacl_offset = 0;
+#endif
 
        /* Check if the security descriptor will be affected by one of the bugs.
         * If not, do nothing and return.
@@ -868,7 +873,7 @@ ntfs_3g_end_extract_blob(struct blob_descriptor *blob, int status, void *_ctx)
                                         "data on \"%s\"",
                                         dentry_full_path(
                                                inode_first_extraction_dentry(inode)));
-                       ret = WIMLIB_ERR_NTFS_3G;
+                       ret = WIMLIB_ERR_SET_REPARSE_DATA;
                        goto out;
                }
        }
@@ -881,11 +886,11 @@ out:
        return ret;
 }
 
-static uint64_t
+static u64
 ntfs_3g_count_dentries(const struct list_head *dentry_list)
 {
        const struct wim_dentry *dentry;
-       uint64_t count = 0;
+       u64 count = 0;
 
        list_for_each_entry(dentry, dentry_list, d_extraction_list_node) {
                count++;