1 files changed, 9 insertions, 0 deletions

diff --git a/shared.c b/shared.c
index 6e8f0ce..58837dc 100644
--- a/shared.c
+++ b/shared.c
@@ -38,48 +38,49 @@ struct cgit_repo *cgit_add_repo(const char *url)
 
         if (++cgit_repolist.count > cgit_repolist.length) {
                 if (cgit_repolist.length == 0)
                         cgit_repolist.length = 8;
                 else
                         cgit_repolist.length *= 2;
                 cgit_repolist.repos = xrealloc(cgit_repolist.repos,
                                                cgit_repolist.length *
                                                sizeof(struct cgit_repo));
         }
 
         ret = &cgit_repolist.repos[cgit_repolist.count-1];
         memset(ret, 0, sizeof(struct cgit_repo));
         ret->url = trim_end(url, '/');
         ret->name = ret->url;
         ret->path = NULL;
         ret->desc = "[no description]";
         ret->owner = NULL;
         ret->section = ctx.cfg.section;
         ret->defbranch = "master";
         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->enable_subject_links = ctx.cfg.enable_subject_links;
         ret->max_stats = ctx.cfg.max_stats;
         ret->module_link = ctx.cfg.module_link;
         ret->readme = NULL;
         ret->mtime = -1;
         ret->about_filter = ctx.cfg.about_filter;
         ret->commit_filter = ctx.cfg.commit_filter;
         ret->source_filter = ctx.cfg.source_filter;
         return ret;
 }
 
 struct cgit_repo *cgit_get_repoinfo(const char *url)
 {
         int i;
         struct cgit_repo *repo;
 
         for (i=0; i<cgit_repolist.count; i++) {
                 repo = &cgit_repolist.repos[i];
                 if (!strcmp(repo->url, url))
                         return repo;
         }
         return NULL;
 }
 
 void *cgit_free_commitinfo(struct commitinfo *info)
@@ -257,60 +258,68 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf)
                 diffbuf = NULL;
                 buflen = 0;
         }
         return 0;
 }
 
 int cgit_diff_files(const unsigned char *old_sha1,
                     const unsigned char *new_sha1, unsigned long *old_size,
                     unsigned long *new_size, int *binary, linediff_fn fn)
 {
         mmfile_t file1, file2;
         xpparam_t diff_params;
         xdemitconf_t emit_params;
         xdemitcb_t emit_cb;
 
         if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_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;
         int ret;
         int prefixlen;
 
         diff_setup(&opt);
         opt.output_format = DIFF_FORMAT_CALLBACK;
         opt.detect_rename = 1;
         opt.rename_limit = ctx.cfg.renamelimit;
         DIFF_OPT_SET(&opt, RECURSIVE);
         opt.format_callback = cgit_diff_tree_cb;
         opt.format_callback_data = fn;
         if (prefix) {
                 opt.nr_paths = 1;
                 opt.paths = &prefix;
                 prefixlen = strlen(prefix);
                 opt.pathlens = &prefixlen;
         }