Merge branch 'sn/subject-link'

[ps-cgit] / shared.c

diff --git a/shared.c b/shared.c
index 83ded44de93b4343364ddfacedc94e9672008a02..8b3a0457748a3f3ef30b48c8d1aecffa4a2c6b66 100644 (file)
--- a/shared.c
+++ b/shared.c
@@ -280,6 +280,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.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;
        }
 
                return 0;
        }
 


@@ -292,6 +296,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);
        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;
 }
 
        return 0;
 }