From 05ac978495e84fe03d91ab591524b7ea138900ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 6 Oct 2011 18:03:35 +0200 Subject: pickaxe: plug diff filespec leak with empty needle 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 Signed-off-by: Junio C Hamano --- diffcore-pickaxe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'diffcore-pickaxe.c') diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index c3760cfef..0835a3be8 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; -- cgit v1.2.1