diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-04-08 00:50:20 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-04-08 00:50:20 +0200 |
| commit | 023d933121ca7352a069f3886caf6fbe958ba27d (patch) | |
| tree | acd2c755148eacf0c0b542fb8c143b480514f66e | |
| parent | ui-tree: add link to plain view for blobs in tree listing (diff) | |
| parent | shared.c: avoid memory leak during diff (diff) | |
| download | cgit-pink-023d933121ca7352a069f3886caf6fbe958ba27d.tar.gz cgit-pink-023d933121ca7352a069f3886caf6fbe958ba27d.zip | |
Merge branch 'stable'
| -rw-r--r-- | shared.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/shared.c b/shared.c index 5f46793..83b71e6 100644 --- a/shared.c +++ b/shared.c @@ -279,6 +279,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; } @@ -291,6 +295,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; } |