summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-04-08 00:48:36 +0200
committerLars Hjemli <hjemli@gmail.com>2010-04-08 00:48:36 +0200
commitce761fde0772236a11b41270f9254c515f724ad5 (patch)
tree8a7922811e56727c1444a3a93deecef2d2c08841
parent9bd3a7b1ea6c5863d7cba1b5352ce707f5d129a0 (diff)
shared.c: avoid memory leak during diff
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--shared.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/shared.c b/shared.c
index 9362d21..6adf2b6 100644
--- a/shared.c
+++ b/shared.c
@@ -278,6 +278,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
 	if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
 	    (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
 		*binary = 1;
+		if (file1.size)
+			free(file1.ptr);
+		if (file2.size)
+			free(file2.ptr);
 		return 0;
 	}
 
@@ -290,6 +294,10 @@ int cgit_diff_files(const unsigned char *old_sha1,
 	emit_cb.outf = filediff_cb;
 	emit_cb.priv = fn;
 	xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
+	if (file1.size)
+		free(file1.ptr);
+	if (file2.size)
+		free(file2.ptr);
 	return 0;
 }