From 97fe3692b6ec962231708af008228c9d99f8ab21 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Sun, 18 Nov 2012 16:25:12 -0600 Subject: [PATCH] make_symlink_reparse_data_buf(): Don't include null terminator --- src/ntfs-capture.c | 4 ++-- src/symlink.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index b47f437e..cc31377b 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -242,8 +242,8 @@ static int ntfs_attr_sha1sum(ntfs_inode *ni, ATTR_RECORD *ar, return 0; } -/* Load the streams from a WIM file or reparse point in the NTFS volume into the - * WIM lookup table */ +/* Load the streams from a file or reparse point in the NTFS volume into the WIM + * lookup table */ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, char path[], size_t path_len, struct lookup_table *lookup_table, diff --git a/src/symlink.c b/src/symlink.c index b1c5b5d3..6ef0dab1 100644 --- a/src/symlink.c +++ b/src/symlink.c @@ -131,27 +131,23 @@ void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret) char *name_utf16 = utf8_to_utf16(symlink_target, utf8_len, &utf16_len); if (!name_utf16) return NULL; - /*DEBUG("utf16_len = %zu", utf16_len);*/ + for (size_t i = 0; i < utf16_len / 2; i++) if (((u16*)name_utf16)[i] == cpu_to_le16('/')) ((u16*)name_utf16)[i] = cpu_to_le16('\\'); - size_t len = 12 + utf16_len * 2 + 4; + size_t len = 12 + utf16_len * 2; void *buf = MALLOC(len); if (!buf) goto out; - /* XXX Fix absolute paths */ u8 *p = buf; - p = put_u16(p, utf16_len + 2); /* Substitute name offset */ + p = put_u16(p, utf16_len); /* Substitute name offset */ p = put_u16(p, utf16_len); /* Substitute name length */ p = put_u16(p, 0); /* Print name offset */ p = put_u16(p, utf16_len); /* Print name length */ - p = put_u32(p, 1); + p = put_u32(p, 1); /* flags: 0 iff *full* target, including drive letter??? */ p = put_bytes(p, utf16_len, (const u8*)name_utf16); - p = put_u16(p, 0); p = put_bytes(p, utf16_len, (const u8*)name_utf16); - p = put_u16(p, 0); - /*DEBUG("utf16_len = %zu, len = %zu", utf16_len, len);*/ *len_ret = len; out: FREE(name_utf16); -- 2.43.0