summaryrefslogtreecommitdiffabout
path: root/shared.c
authorLars Hjemli <hjemli@gmail.com>2010-04-07 22:48:36 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-04-07 22:48:36 (UTC)
commitce761fde0772236a11b41270f9254c515f724ad5 (patch) (unidiff)
tree8a7922811e56727c1444a3a93deecef2d2c08841 /shared.c
parent9bd3a7b1ea6c5863d7cba1b5352ce707f5d129a0 (diff)
downloadcgit-ce761fde0772236a11b41270f9254c515f724ad5.zip
cgit-ce761fde0772236a11b41270f9254c515f724ad5.tar.gz
cgit-ce761fde0772236a11b41270f9254c515f724ad5.tar.bz2
shared.c: avoid memory leak during diff
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'shared.c') (more/less context) (ignore whitespace changes)
-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
@@ -277,8 +277,12 @@ int cgit_diff_files(const unsigned char *old_sha1,
277 277
278 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || 278 if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) ||
279 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { 279 (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) {
280 *binary = 1; 280 *binary = 1;
281 if (file1.size)
282 free(file1.ptr);
283 if (file2.size)
284 free(file2.ptr);
281 return 0; 285 return 0;
282 } 286 }
283 287
284 memset(&diff_params, 0, sizeof(diff_params)); 288 memset(&diff_params, 0, sizeof(diff_params));
@@ -289,8 +293,12 @@ int cgit_diff_files(const unsigned char *old_sha1,
289 emit_params.flags = XDL_EMIT_FUNCNAMES; 293 emit_params.flags = XDL_EMIT_FUNCNAMES;
290 emit_cb.outf = filediff_cb; 294 emit_cb.outf = filediff_cb;
291 emit_cb.priv = fn; 295 emit_cb.priv = fn;
292 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); 296 xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
297 if (file1.size)
298 free(file1.ptr);
299 if (file2.size)
300 free(file2.ptr);
293 return 0; 301 return 0;
294} 302}
295 303
296void cgit_diff_tree(const unsigned char *old_sha1, 304void cgit_diff_tree(const unsigned char *old_sha1,