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

gitster · gitster · commit 8ff1ddd71731 · 2015-05-05T21:00:25.000-07:00
* sb/line-log-plug-pairdiff-leak:
  line-log.c: fix a memleak
diff --git a/line-log.c b/line-log.c
@@ -1099,6 +1099,7 @@ static int process_all_files(struct line_log_data **range_out,
 			rg->pair = diff_filepair_dup(queue->queue[i]);
 			memcpy(&rg->diff, pairdiff, sizeof(struct diff_ranges));
 		}
+		free(pairdiff);
 	}
 
 	return changed;

Original file line number	Diff line number	Diff line change
`@@ -1099,6 +1099,7 @@ static int process_all_files(struct line_log_data **range_out,`
`1099`	`1099`	`rg->pair = diff_filepair_dup(queue->queue[i]);`
`1100`	`1100`	`memcpy(&rg->diff, pairdiff, sizeof(struct diff_ranges));`
`1101`	`1101`	`}`
	`1102`	`+ free(pairdiff);`
`1102`	`1103`	`}`
`1103`	`1104`
`1104`	`1105`	`return changed;`