X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsecurity.c;h=788426c25dd7446d8afefb4a903ae3b2e01f9538;hp=628b93584d1dfff77727ecc9f845c85c2b6a6152;hb=2200ddb2ab85b390daa140de5338ac9f023d3683;hpb=5caa3dfded8e0f590112b59feeb3b55e4fa28420 diff --git a/src/security.c b/src/security.c index 628b9358..788426c2 100644 --- a/src/security.c +++ b/src/security.c @@ -146,7 +146,7 @@ struct wim_security_data_disk { * the validation in libntfs-3g. */ static void -empty_sacl_fixup(SECURITY_DESCRIPTOR_RELATIVE *descr, size_t *size_p) +empty_sacl_fixup(SECURITY_DESCRIPTOR_RELATIVE *descr, u64 *size_p) { /* No-op if no NTFS-3g support, or if NTFS-3g is version 2013 or later * */ @@ -568,13 +568,12 @@ sd_set_add_sd(struct wim_sd_set *sd_set, const char *descriptor, size_t size) new = MALLOC(sizeof(*new)); if (!new) goto out; - descr_copy = MALLOC(size); + + descr_copy = memdup(descriptor, size); if (!descr_copy) goto out_free_node; sd = sd_set->sd; - - memcpy(descr_copy, descriptor, size); new->security_id = sd->num_entries; copy_hash(new->hash, hash);