From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2015 04:00:25 +0000 (-0700)
Subject: Merge branch 'sb/line-log-plug-pairdiff-leak'
X-Git-Tag: v2.5.0-rc0~159
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ff1ddd71731d42e349bacdf515cefa021c4aa03?ds=inline;hp=-c

Merge branch 'sb/line-log-plug-pairdiff-leak'

* sb/line-log-plug-pairdiff-leak:
line-log.c: fix a memleak
---

8ff1ddd71731d42e349bacdf515cefa021c4aa03
diff --combined line-log.c
index a490efea07,e13455fd31..b43ac58698
--- a/line-log.c
+++ b/line-log.c
@@@ -237,7 -237,7 +237,7 @@@ static void diff_ranges_release(struct 
  	range_set_release(&diff->target);
  }
  
 -void line_log_data_init(struct line_log_data *r)
 +static void line_log_data_init(struct line_log_data *r)
  {
  	memset(r, 0, sizeof(struct line_log_data));
  	range_set_init(&r->ranges, 0);
@@@ -1099,6 -1099,7 +1099,7 @@@ static int process_all_files(struct lin
  			rg->pair = diff_filepair_dup(queue->queue[i]);
  			memcpy(&rg->diff, pairdiff, sizeof(struct diff_ranges));
  		}
+ 		free(pairdiff);
  	}
  
  	return changed;