diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2010-04-08 00:50:20 +0200 | 
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-04-08 00:50:20 +0200 | 
| commit | 023d933121ca7352a069f3886caf6fbe958ba27d (patch) | |
| tree | acd2c755148eacf0c0b542fb8c143b480514f66e /shared.c | |
| parent | ff3a3b4e2b7463bb8cb370bdda393e8b3526fcb9 (diff) | |
| parent | ce761fde0772236a11b41270f9254c515f724ad5 (diff) | |
Merge branch 'stable'
Diffstat (limited to 'shared.c')
| -rw-r--r-- | shared.c | 8 | 
1 files changed, 8 insertions, 0 deletions
| @@ -279,6 +279,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.size) +			free(file1.ptr); +		if (file2.size) +			free(file2.ptr);  		return 0;  	} @@ -291,6 +295,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); +	if (file1.size) +		free(file1.ptr); +	if (file2.size) +		free(file2.ptr);  	return 0;  } | 
