From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Mar 2012 06:22:22 +0000 (-0700)
Subject: apply: free unused fragments for submodule patch
X-Git-Tag: v1.7.11-rc0~126^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d16c2d51412c3ebf06f88faddde3610d6e21892;p=git.git

apply: free unused fragments for submodule patch

We simply discarded the fragments that we are not going to use upon seeing
a patch to update the submodule commit bound at path that we have not
checked out.

Free these fragments, not to leak them.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/apply.c b/builtin/apply.c
index c65fb3f8d..9491d38ab 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -196,17 +196,20 @@ struct patch {
 	struct patch *next;
 };
 
-static void free_patch(struct patch *patch)
+static void free_fragment_list(struct fragment *list)
 {
-	struct fragment *fragment = patch->fragments;
-
-	while (fragment) {
-		struct fragment *fragment_next = fragment->next;
-		if (fragment->patch != NULL && fragment->free_patch)
-			free((char *)fragment->patch);
-		free(fragment);
-		fragment = fragment_next;
+	while (list) {
+		struct fragment *next = list->next;
+		if (list->free_patch)
+			free((char *)list->patch);
+		free(list);
+		list = next;
 	}
+}
+
+static void free_patch(struct patch *patch)
+{
+	free_fragment_list(patch->fragments);
 	free(patch->def_name);
 	free(patch->old_name);
 	free(patch->new_name);
@@ -2992,7 +2995,10 @@ static int apply_data(struct patch *patch, struct stat *st, struct cache_entry *
 				/*
 				 * There is no way to apply subproject
 				 * patch without looking at the index.
+				 * NEEDSWORK: shouldn't this be flagged
+				 * as an error???
 				 */
+				free_fragment_list(patch->fragments);
 				patch->fragments = NULL;
 			}
 		} else {