Merge branch 'stable'

diff --combined shared.c
index 5f4679335e0f063cadc57b79953f2c078cff11a3,6adf2b6361c42cd2f8bd6356a97fe08821bcb1a4..83b71e65c5d1980b60e01cedfb7d253a42f0984b
--- 1/shared.c
--- 2/shared.c
+++ b/shared.c
@@@ -59,7 -59,6 +59,7 @@@ struct cgit_repo *cgit_add_repo(const c
        ret->snapshots = ctx.cfg.snapshots;
        ret->enable_log_filecount = ctx.cfg.enable_log_filecount;
        ret->enable_log_linecount = ctx.cfg.enable_log_linecount;
 +      ret->enable_remote_branches = ctx.cfg.enable_remote_branches;
        ret->max_stats = ctx.cfg.max_stats;
        ret->module_link = ctx.cfg.module_link;
        ret->readme = NULL;
@@@ -279,6 -278,10 +279,10 @@@ int cgit_diff_files(const unsigned cha
        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 -294,10 +295,10 @@@
        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;
  }