author | Lars Hjemli <hjemli@gmail.com> | 2010-04-07 22:48:36 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-04-07 22:48:36 (UTC) |
commit | ce761fde0772236a11b41270f9254c515f724ad5 (patch) (unidiff) | |
tree | 8a7922811e56727c1444a3a93deecef2d2c08841 /shared.c | |
parent | 9bd3a7b1ea6c5863d7cba1b5352ce707f5d129a0 (diff) | |
download | cgit-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>
-rw-r--r-- | shared.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -275,24 +275,32 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
275 | *old_size = file1.size; | 275 | *old_size = file1.size; |
276 | *new_size = file2.size; | 276 | *new_size = file2.size; |
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)); |
285 | memset(&emit_params, 0, sizeof(emit_params)); | 289 | memset(&emit_params, 0, sizeof(emit_params)); |
286 | memset(&emit_cb, 0, sizeof(emit_cb)); | 290 | memset(&emit_cb, 0, sizeof(emit_cb)); |
287 | diff_params.flags = XDF_NEED_MINIMAL; | 291 | diff_params.flags = XDF_NEED_MINIMAL; |
288 | emit_params.ctxlen = 3; | 292 | emit_params.ctxlen = 3; |
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 | ||
296 | void cgit_diff_tree(const unsigned char *old_sha1, | 304 | void cgit_diff_tree(const unsigned char *old_sha1, |
297 | const unsigned char *new_sha1, | 305 | const unsigned char *new_sha1, |
298 | filepair_fn fn, const char *prefix) | 306 | filepair_fn fn, const char *prefix) |