From: René Scharfe Date: Thu, 06 Oct 2011 16:03:35 GMT Subject: [PATCH 1/7] pickaxe: plug diff filespec leak with empty needle Message-ID: <4E8DD157.3020808@lsrfire.ath.cx> In-Reply-To: <4E8DD065.3040607@lsrfire.ath.cx> Check first for the unlikely case of an empty needle string and only then populate the filespec, lest we leak it. Signed-off-by: Rene Scharfe --- diffcore-pickaxe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index c3760cf..0835a3b 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -152,10 +152,10 @@ static unsigned int contains(struct diff_filespec *one, unsigned int cnt; unsigned long sz; const char *data; - if (diff_populate_filespec(one, 0)) - return 0; if (!len) return 0; + if (diff_populate_filespec(one, 0)) + return 0; sz = one->size; data = one->data; -- 1.7.7