summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-01-26 04:48:58 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-01-26 05:17:19 (GMT)
commite1b161161d253a9e7e4cf21cd2ab5b82a4b85273 (patch)
treeb9adbfc7986c01d9e77d3e46f4af7ca42009e90e /diffcore-pickaxe.c
parentcb280e107523e5263f390db715234700355a63b9 (diff)
downloadgit-e1b161161d253a9e7e4cf21cd2ab5b82a4b85273.zip
git-e1b161161d253a9e7e4cf21cd2ab5b82a4b85273.tar.gz
git-e1b161161d253a9e7e4cf21cd2ab5b82a4b85273.tar.bz2
diffcore-pickaxe: fix infinite loop on zero-length needle
The "contains" algorithm runs into an infinite loop if the needle string has zero length. The loop could be modified to handle this, but it makes more sense to simply have an empty needle return no matches. Thus, a command like git log -S produces no output. We place the check at the top of the function so that we get the same results with or without --pickaxe-regex. Note that until now, git log -S --pickaxe-regex would match everything, not nothing. Arguably, an empty pickaxe string should simply produce an error message; however, this is still a useful assertion to add to the algorithm at this layer of the code. Noticed by Bill Lear. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diffcore-pickaxe.c')
-rw-r--r--diffcore-pickaxe.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index de44ada..286919e 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -14,6 +14,8 @@ static unsigned int contains(struct diff_filespec *one,
const char *data;
if (diff_populate_filespec(one, 0))
return 0;
+ if (!len)
+ return 0;
sz = one->size;
data = one->data;