mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pickaxe: plug regex leak

Browse Source 
With -G... --pickaxe-all, free the regex before returning even if we
found a match.  Also get rid of the variable has_changes, as we can
simply break out of the loop.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2011-10-06 18:14:55 +02:00
committed by Junio C Hamano
parent 05ac978495
commit 2b5f07f16c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
diffcore-pickaxe.c
View File

@ -96,7 +96,7 @@ static int diff_grep(struct diff_filepair *p, regex_t *regexp, struct diff_optio
static void diffcore_pickaxe_grep(struct diff_options *o) static void diffcore_pickaxe_grep(struct diff_options *o)
{ {
struct diff_queue_struct *q = &diff_queued_diff; struct diff_queue_struct *q = &diff_queued_diff;
int i, has_changes, err; int i, err;
regex_t regex; regex_t regex;
struct diff_queue_struct outq; struct diff_queue_struct outq;
outq.queue = NULL; outq.queue = NULL;
@ -112,13 +112,11 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
if (o->pickaxe_opts & DIFF_PICKAXE_ALL) { if (o->pickaxe_opts & DIFF_PICKAXE_ALL) {
/* Showing the whole changeset if needle exists */ /* Showing the whole changeset if needle exists */
for (i = has_changes = 0; !has_changes && i < q->nr; i++) { for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i]; struct diff_filepair *p = q->queue[i];
if (diff_grep(p, &regex, o)) if (diff_grep(p, &regex, o))
has_changes++; goto out; /* do not munge the queue */
} }
if (has_changes)
return; /* do not munge the queue */
/* /*
* Otherwise we will clear the whole queue by copying * Otherwise we will clear the whole queue by copying
@ -138,10 +136,11 @@ static void diffcore_pickaxe_grep(struct diff_options *o)
} }
} }
regfree(&regex);
free(q->queue); free(q->queue);
*q = outq; *q = outq;
out:
regfree(&regex);
return; return;
} }