From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Jun 2010 09:38:46 +0000 (+0200)
Subject: Merge branch 'sn/subject-link'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/9af580d8f6e31ccd68307a728a710c525e4133ab?hp=-c

Merge branch 'sn/subject-link'
---

9af580d8f6e31ccd68307a728a710c525e4133ab
diff --combined shared.c
index 83b71e6,83ded44..8b3a045
--- a/shared.c
+++ b/shared.c
@@@ -60,6 -60,7 +60,7 @@@ struct cgit_repo *cgit_add_repo(const c
  	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;
@@@ -279,10 -280,6 +280,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;
  	}
  
@@@ -295,10 -292,6 +296,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;
  }