diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2022-11-03 01:01:41 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-03 03:16:34 +0300 |
| commit | ef84222fa9b3ed163bacd6dc59a1d855dfbfbd75 (patch) | |
| tree | c7aa0c89a30b2d2bbc286772c2efc4030afcde1c /line-log.c | |
| parent | 04ae00062d2ec301828e8df9931817be4b2f8653 (diff) | |
line-log: free the diff queues' arrays when processing merge commits
When processing merge commits, the line-level log first creates an
array of diff queues, each comparing the merge commit with one of its
parents, to check whether any of the files in the given line ranges
were modified. Alas, when freeing these queues it only frees the
filepairs in the queues, but not the queues' internal arrays holding
pointers to those filepairs.
Use the diff_free_queue() helper function introduced in the previous
commit to free the diff queues' internal arrays as well.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'line-log.c')
| -rw-r--r-- | line-log.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/line-log.c b/line-log.c index 7a74daf2e8..a7f3e7f6ce 100644 --- 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); } |