update_image.c: handle_conflict(): fix freeing of unused branch
authorEric Biggers <ebiggers3@gmail.com>
Sun, 25 Jan 2015 00:43:42 +0000 (18:43 -0600)
committerEric Biggers <ebiggers3@gmail.com>
Sun, 25 Jan 2015 00:43:45 +0000 (18:43 -0600)
If the directory has alternate data streams, they should be freed here.

src/update_image.c

index 65389e156cc227464c82d6df0cc0b7ad3e08cab7..d5e0c787a30e787f6b59d99a9847ec6d0aaf8eb9 100644 (file)
@@ -535,7 +535,7 @@ handle_conflict(struct wim_dentry *branch, struct wim_dentry *existing,
                                return ret;
                        }
                }
-               free_dentry(branch);
+               free_dentry_tree(branch, j->lookup_table);
                return 0;
        } else if (add_flags & WIMLIB_ADD_FLAG_NO_REPLACE) {
                /* Can't replace nondirectory file  */