Merge branch 'stable'

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 5f4679335e0f063cadc57b79953f2c078cff11a3..83b71e65c5d1980b60e01cedfb7d253a42f0984b 100644 (file)
--- 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;
 }