[PATCH v4 03/19] apply: clear_image() clears things a bit more

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 10, 2012, 07:03 UTC
Message-ID: <1341903852-4815-4-git-send-email-gitster@pobox.com>
In-Reply-To: <1341903852-4815-1-git-send-email-gitster@pobox.com>

The clear_image() function did not clear the line table in the image structure; this does not matter for the current callers, as the function is only called from the codepaths that deal with binary patches where the line table is never populated, and the codepaths that do populate the line table free it themselves.

But it will start to matter when we introduce a codepath to retry a failed patch, so make sure it clears and frees everything.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/apply.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/apply.c b/builtin/apply.c
index 35460c9..09f5df3 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -371,8 +371,8 @@ static void prepare_image(struct image *image, char *buf, size_t len,
 static void clear_image(struct image *image)
 {
 	free(image->buf);
-	image->buf = NULL;
-	image->len = 0;
+	free(image->line_allocated);
+	memset(image, 0, sizeof(*image));
 }
 
 /* fmt must contain _one_ %s and no other substitution */

-- 
1.7.11.1.294.g68a9409