From: Lars Hjemli <hjemli@gmail.com>
Date: Wed, 7 Apr 2010 22:50:20 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/023d933121ca7352a069f3886caf6fbe958ba27d?hp=-c

Merge branch 'stable'
---

023d933121ca7352a069f3886caf6fbe958ba27d
diff --combined shared.c
index 5f46793,6adf2b6..83b71e6
--- a/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;
  }