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) (side-by-side diff) | |
tree | 8a7922811e56727c1444a3a93deecef2d2c08841 | |
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
@@ -273,28 +273,36 @@ int cgit_diff_files(const unsigned char *old_sha1, return 1; *old_size = file1.size; *new_size = file2.size; 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; } memset(&diff_params, 0, sizeof(diff_params)); memset(&emit_params, 0, sizeof(emit_params)); memset(&emit_cb, 0, sizeof(emit_cb)); diff_params.flags = XDF_NEED_MINIMAL; emit_params.ctxlen = 3; emit_params.flags = XDL_EMIT_FUNCNAMES; 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; } void cgit_diff_tree(const unsigned char *old_sha1, const unsigned char *new_sha1, filepair_fn fn, const char *prefix) { struct diff_options opt; |