From: Jeff King <peff@peff.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Bill Lear <rael@zopyra.com>, git@vger.kernel.org
Subject: [PATCH] diffcore-pickaxe: fix infinite loop on zero-length needle
Date: Thu, 25 Jan 2007 23:48:58 -0500 [thread overview]
Message-ID: <20070126044858.GA8653@coredump.intra.peff.net> (raw)
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>
---
On Thu, Jan 25, 2007 at 06:06:51PM -0600, Bill Lear wrote:
> git log -S --check foo
>
> and the thing went off into outer space. Now at over 2 1/2 minutes of
> CPU time on my 2 Ghz Opteron box...
diffcore-pickaxe.c | 2 ++
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;
--
1.5.0.rc2.gccd57
next reply other threads:[~2007-01-26 4:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-26 4:48 Jeff King [this message]
2007-01-26 4:56 ` [PATCH] diffcore-pickaxe: fix infinite loop on zero-length needle Jeff King
2007-01-26 5:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070126044858.GA8653@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=rael@zopyra.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox