From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Thu, 6 Oct 2011 16:23:11 +0000 (+0200)
Subject: pickaxe: plug regex/kws leak
X-Git-Tag: v1.7.8-rc0~38^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8e854b00d86070dd463a91bdbc401fb25dc9ddb5;p=git.git

pickaxe: plug regex/kws leak

With -S... --pickaxe-all, free the regex or the kws 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>
---

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 96f7ea67d..c367d8d17 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -221,7 +221,7 @@ static void diffcore_pickaxe_count(struct diff_options *o)
 
 	if (opts & DIFF_PICKAXE_ALL) {
 		/* 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];
 			if (!DIFF_FILE_VALID(p->one)) {
 				if (!DIFF_FILE_VALID(p->two))
@@ -238,9 +238,9 @@ static void diffcore_pickaxe_count(struct diff_options *o)
 				 contains(p->one, needle, len, regexp, kws) !=
 				 contains(p->two, needle, len, regexp, kws))
 				has_changes++;
+			if (has_changes)
+				goto out; /* do not munge the queue */
 		}
-		if (has_changes)
-			return; /* not munge the queue */
 
 		/* otherwise we will clear the whole queue
 		 * by copying the empty outq at the end of this
@@ -278,13 +278,14 @@ static void diffcore_pickaxe_count(struct diff_options *o)
 				diff_free_filepair(p);
 		}
 
+	free(q->queue);
+	*q = outq;
+
+ out:
 	if (opts & DIFF_PICKAXE_REGEX)
 		regfree(&regex);
 	else
 		kwsfree(kws);
-
-	free(q->queue);
-	*q = outq;
 	return;
 }