Add memdup() function

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 5082eac64d48af415a88daef375efed499f31c3b..47a6175d789bbd3579a2d5ce381d80ddfa8d20b1 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -1025,6 +1025,7 @@ dentry_add_child(struct wim_dentry * restrict parent,
                 struct wim_dentry * restrict child)
 {
        wimlib_assert(dentry_is_directory(parent));
+       wimlib_assert(parent != child);
 
        struct rb_root *root = &parent->d_inode->i_children;
        struct rb_node **new = &(root->rb_node);
@@ -1179,12 +1180,11 @@ add_stream_from_data_buffer(const void *buffer, size_t size,
                lte = new_lookup_table_entry();
                if (!lte)
                        return NULL;
-               buffer_copy = MALLOC(size);
+               buffer_copy = memdup(buffer, size);
                if (!buffer_copy) {
                        free_lookup_table_entry(lte);
                        return NULL;
                }
-               memcpy(buffer_copy, buffer, size);
                lte->resource_location            = RESOURCE_IN_ATTACHED_BUFFER;
                lte->attached_buffer              = buffer_copy;
                lte->resource_entry.original_size = size;
@@ -1773,32 +1773,43 @@ read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len,
 
                /* Not end of directory.  Allocate this child permanently and
                 * link it to the parent and previous child. */
-               child = MALLOC(sizeof(struct wim_dentry));
+               child = memdup(&cur_child, sizeof(struct wim_dentry));
                if (!child) {
-                       ERROR("Failed to allocate %zu bytes for new dentry",
-                             sizeof(struct wim_dentry));
+                       ERROR("Failed to allocate new dentry!");
                        ret = WIMLIB_ERR_NOMEM;
                        break;
                }
-               memcpy(child, &cur_child, sizeof(struct wim_dentry));
-               dentry_add_child(dentry, child);
-               inode_add_dentry(child, child->d_inode);
-
-               /* If there are children of this child, call this procedure
-                * recursively. */
-               if (child->subdir_offset != 0) {
-                       ret = read_dentry_tree(metadata_resource,
-                                              metadata_resource_len, child);
-                       if (ret)
-                               break;
-               }
 
                /* Advance to the offset of the next child.  Note: We need to
                 * advance by the TOTAL length of the dentry, not by the length
-                * child->length, which although it does take into account the
-                * padding, it DOES NOT take into account alternate stream
+                * cur_child.length, which although it does take into account
+                * the padding, it DOES NOT take into account alternate stream
                 * entries. */
                cur_offset += dentry_total_length(child);
+
+               if (dentry_add_child(dentry, child)) {
+                       WARNING("Ignoring duplicate dentry \"%"WS"\"",
+                               child->file_name);
+                       WARNING("(In directory \"%"TS"\")", dentry_full_path(dentry));
+                       free_dentry(child);
+               } else {
+                       inode_add_dentry(child, child->d_inode);
+                       /* If there are children of this child, call this
+                        * procedure recursively. */
+                       if (child->subdir_offset != 0) {
+                               if (dentry_is_directory(child)) {
+                                       ret = read_dentry_tree(metadata_resource,
+                                                              metadata_resource_len,
+                                                              child);
+                                       if (ret)
+                                               break;
+                               } else {
+                                       WARNING("Ignoring children of non-directory \"%"TS"\"",
+                                               dentry_full_path(child));
+                               }
+                       }
+
+               }
        }
        return ret;
 }