1
0
mirror of https://github.com/git/git.git synced 2024-11-19 06:31:47 +01:00

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>
This commit is contained in:
Jeff King 2007-01-25 23:48:58 -05:00 committed by Junio C Hamano
parent cb280e1075
commit e1b161161d

@ -14,6 +14,8 @@ static unsigned int contains(struct diff_filespec *one,
const char *data; const char *data;
if (diff_populate_filespec(one, 0)) if (diff_populate_filespec(one, 0))
return 0; return 0;
if (!len)
return 0;
sz = one->size; sz = one->size;
data = one->data; data = one->data;