From: Eric Biggers <ebiggers3@gmail.com>
Date: Sun, 25 Jan 2015 00:43:42 +0000 (-0600)
Subject: update_image.c: handle_conflict(): fix freeing of unused branch
X-Git-Tag: v1.8.0~57
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=b16e53f88293b032ee6e67dfbc297d3821da6777

update_image.c: handle_conflict(): fix freeing of unused branch

If the directory has alternate data streams, they should be freed here.
---

diff --git a/src/update_image.c b/src/update_image.c
index 65389e15..d5e0c787 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -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  */