From: Eric Biggers <ebiggers3@gmail.com>
Date: Tue, 14 May 2013 02:09:18 +0000 (-0500)
Subject: do_overlay(): Correctly revert changes
X-Git-Tag: v1.4.0~72
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=075d64ebb85a4c4ac6c47622a2f0bb6a36f16824

do_overlay(): Correctly revert changes
---

diff --git a/src/update_image.c b/src/update_image.c
index 7247b1c0..a6bad2aa 100644
--- a/src/update_image.c
+++ b/src/update_image.c
@@ -48,6 +48,7 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
 	}
 
 	rb_root = &branch->d_inode->i_children;
+	LIST_HEAD(moved_children);
 	while (rb_root->rb_node) { /* While @branch has children... */
 		struct wim_dentry *child = rbnode_dentry(rb_root->rb_node);
 		struct wim_dentry *existing;
@@ -61,12 +62,17 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch)
 			int ret;
 			ret = do_overlay(existing, child);
 			if (ret) {
-				/* Overlay failed.  Revert the change to avoid
-				 * leaking the directory tree rooted at @child.
-				 * */
+				/* Overlay failed.  Revert the changes. */
 				dentry_add_child(branch, child);
+				list_for_each_entry(child, &moved_children, tmp_list)
+				{
+					unlink_dentry(child);
+					dentry_add_child(branch, child);
+				}
 				return ret;
 			}
+		} else {
+			list_add(&child->tmp_list, &moved_children);
 		}
 	}
 	free_dentry(branch);