Merge branch 'ab/various-leak-fixes'

[thirdparty/git.git] / line-log.c

diff --git a/line-log.c b/line-log.c
index 51d93310a4dee18ccfb559803583500ec45b27b4..a7f3e7f6ce43e0ce4786e417608a1a43bac47105 100644 (file)
--- a/line-log.c
+++ b/line-log.c
@@ -1089,10 +1089,8 @@ static struct diff_filepair *diff_filepair_dup(struct diff_filepair *pair)
 
 static void free_diffqueues(int n, struct diff_queue_struct *dq)
 {
-       int i, j;
-       for (i = 0; i < n; i++)
-               for (j = 0; j < dq[i].nr; j++)
-                       diff_free_filepair(dq[i].queue[j]);
+       for (int i = 0; i < n; i++)
+               diff_free_queue(&dq[i]);
        free(dq);
 }
 
@@ -1195,6 +1193,7 @@ static int process_ranges_ordinary_commit(struct rev_info *rev, struct commit *c
        if (parent)
                add_line_range(rev, parent, parent_range);
        free_line_log_data(parent_range);
+       diff_free_queue(&queue);
        return changed;
 }