X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rerere.c;h=b463c07f04b127ee3d1e17962813367fb4a5a588;hb=566842f62bdf1f16c2e94fb431445d2e6c0f3f0b;hp=b8867ab4add83dee4ab99108e96949bcd65290a0;hpb=aa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1;p=git.git

diff --git a/builtin-rerere.c b/builtin-rerere.c
index b8867ab4a..b463c07f0 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -78,6 +78,13 @@ static void append_line(struct buffer *buffer, const char *line)
 	buffer->nr += len;
 }
 
+static void clear_buffer(struct buffer *buffer)
+{
+	free(buffer->ptr);
+	buffer->ptr = NULL;
+	buffer->nr = buffer->alloc = 0;
+}
+
 static int handle_file(const char *path,
 	 unsigned char *sha1, const char *output)
 {
@@ -131,6 +138,8 @@ static int handle_file(const char *path,
 				SHA1_Update(&ctx, two->ptr, two->nr);
 				SHA1_Update(&ctx, "\0", 1);
 			}
+			clear_buffer(one);
+			clear_buffer(two);
 		} else if (hunk == 1)
 			append_line(one, buf);
 		else if (hunk == 2)