Add ADS entry workaround

[wimlib] / src / mount_image.c

diff --git a/src/mount_image.c b/src/mount_image.c
index cc1c57dc90f8def293b3d186cb39703be54441e7..37bc68ce0f56efa74d3e29601e516412a19179c6 100644 (file)
--- a/src/mount_image.c
+++ b/src/mount_image.c
@@ -1646,7 +1646,7 @@ wimfs_getxattr(const char *path, const char *name, char *value,
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 

-       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+       if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)

                return -ENOATTR;
        name += 5;
 
                return -ENOATTR;
        name += 5;
 


@@ -1740,6 +1740,10 @@ wimfs_listxattr(const char *path, char *list, size_t size)
 
        p = list;
        for (i = 0; i < inode->i_num_ads; i++) {
 
        p = list;
        for (i = 0; i < inode->i_num_ads; i++) {

+
+               if (!ads_entry_is_named_stream(&inode->i_ads_entries[i]))
+                       continue;
+

                char *stream_name_mbs;
                size_t stream_name_mbs_nbytes;
                int ret;
                char *stream_name_mbs;
                size_t stream_name_mbs_nbytes;
                int ret;


@@ -2120,7 +2124,7 @@ wimfs_setxattr(const char *path, const char *name,
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 
        if (!(ctx->mount_flags & WIMLIB_MOUNT_FLAG_STREAM_INTERFACE_XATTR))
                return -ENOTSUP;
 

-       if (strlen(name) < 5 || memcmp(name, "user.", 5) != 0)
+       if (strlen(name) <= 5 || memcmp(name, "user.", 5) != 0)

                return -ENOATTR;
        name += 5;
 
                return -ENOATTR;
        name += 5;