Merge branch 'sb/line-log-plug-pairdiff-leak'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:25 +0000 (21:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 May 2015 04:00:25 +0000 (21:00 -0700)
* sb/line-log-plug-pairdiff-leak:
line-log.c: fix a memleak

1  2 
line-log.c
diff --combined line-log.c
index a490efea07519edb006e515c8a0fdf60241e546d,e13455fd31cfd9f58ee73da113b2a517f69937bc..b43ac5869857903bd105546d9cf07fb2b2451d31
@@@ -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;