From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 14 Dec 2014 01:40:02 +0000 (-0600)
Subject: tagged_items.c: length should be rounded up when adding item
X-Git-Tag: v1.7.4~33
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=5731558efd18b5199e0b63de16cf6b11a652104e

tagged_items.c: length should be rounded up when adding item

Also 0-fill the new item, including the padding.

These changes have no effect on the only caller of
inode_add_tagged_item() but should be made for correctness in case this
function gets more callers in the future.
---

diff --git a/src/tagged_items.c b/src/tagged_items.c
index 86ad33e6..e3ba53f4 100644
--- a/src/tagged_items.c
+++ b/src/tagged_items.c
@@ -116,7 +116,7 @@ inode_add_tagged_item(struct wim_inode *inode, u32 tag, u32 len)
 
 	/* We prepend the item instead of appending it because it's easier.  */
 
-	itemsize = sizeof(struct tagged_item_header) + len;
+	itemsize = sizeof(struct tagged_item_header) + ((len + 7) & ~7);
 	newsize = itemsize + inode->i_extra_size;
 
 	buf = MALLOC(newsize);
@@ -133,7 +133,7 @@ inode_add_tagged_item(struct wim_inode *inode, u32 tag, u32 len)
 	hdr = (struct tagged_item_header *)buf;
 	hdr->tag = cpu_to_le32(tag);
 	hdr->length = cpu_to_le32(len);
-	return hdr->data;
+	return memset(hdr->data, 0, (len + 7) & ~7);
 }
 
 static inline struct wimlib_unix_data_disk *