Cleanup libtar mkxattr, explicitly null-terminate strings

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/tar/pax_header.c b/lib/tar/pax_header.c
index a96a32f..95fb447 100644
--- a/lib/tar/pax_header.c
+++ b/lib/tar/pax_header.c
@@ -18,10 +18,14 @@ static tar_xattr_t *mkxattr(const char *key, size_t keylen,
 		return NULL;
 
 	xattr->key = xattr->data;
-	xattr->value = (sqfs_u8 *)xattr->data + keylen + 1;
-	xattr->value_len = valuelen;
 	memcpy(xattr->key, key, keylen);
+	xattr->key[keylen] = '\0';
+
+	xattr->value = (sqfs_u8 *)xattr->key + keylen + 1;
 	memcpy(xattr->value, value, valuelen);
+	xattr->value[valuelen] = '\0';
+
+	xattr->value_len = valuelen;
 	return xattr;
 }