From: "Carlos Martín Nieto" <cmn@elego.de>
To: "Henrik Grubbström" <grubba@grubba.org>
Cc: Git Mailing list <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: Infinite loop in cascade_filter_fn()
Date: Fri, 25 Nov 2011 16:38:29 +0100 [thread overview]
Message-ID: <20111125153829.GB10417@beez.lab.cmartin.tk> (raw)
In-Reply-To: <Pine.GSO.4.63.1111231801580.5099@shipon.roxen.com>
[-- Attachment #1: Type: text/plain, Size: 2907 bytes --]
On Wed, Nov 23, 2011 at 06:40:47PM +0100, Henrik Grubbström wrote:
> Hi.
>
> My git repository walker just got bitten by what seems to be a
> reasonably new bug in convert.c:cascade_filter_fn() (git 1.7.8.rc3
> (gentoo)).
>
> How to reproduce:
>
> git clone git@github.com:pikelang/Pike.git
>
> git checkout -f 0e2080f838c6f0bc7d670ac7549676a353451dca^
>
> git checkout -f 0e2080f838c6f0bc7d670ac7549676a353451dca
>
> The first two commands complete as expected, while the last hangs forever.
> Performing the same with git 1.7.6.4 works as expected.
>
> The problematic file seems to be
> /src/modules/_Crypto/rijndael_ecb_vt.txt which has the attributes:
> text ident eol=crlf
It looks like you won the lottery. The problem was that the output
buffer only has one byte available when we see a LF. We check whether
there is enough space (two bytes) to store CRLF in the output buffer,
see that there isn't and return. cascade_filter_fn sees that the
buffer hasn't been written fully and calls lf_to_crlf_filter_fn with
the same output buffer, which we still can't fill, because it's too
short.
This patch fixes this, but I think it would still break if the LF is
at the end of the file. Changing the `if (!input)` to put the LF in
the output buffer may or may not be the right soulution. I feel like
this should be handled by cascade_filter_fn rather than the actual
filter somehow, but Junio's comment (4ae66704 'stream filter: add "no
more input" to the filters') suggests otherwise.
I'm working on a cleaner patch that takes care of a bit of state, but
this is the general idea.
cmn
--- 8< ---
Subject: [PATCH] convert: don't loop indefintely if at LF-to-CRLF streaming
If we find a LF when the output buffer is only has one byte remaining,
cascade_filter_fn won't notice that we need more input and won't drain
the output buffer.
In such a case, store whether we've outputted the CR so we can retake
it from there.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
---
convert.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/convert.c b/convert.c
index 86e9c29..4218f40 100644
--- a/convert.c
+++ b/convert.c
@@ -881,6 +881,7 @@ static int lf_to_crlf_filter_fn(struct stream_filter *filter,
char *output, size_t *osize_p)
{
size_t count;
+ static int put_cr = 0;
if (!input)
return 0; /* we do not keep any states */
@@ -890,10 +891,14 @@ static int lf_to_crlf_filter_fn(struct stream_filter *filter,
for (i = o = 0; o < *osize_p && i < count; i++) {
char ch = input[i];
if (ch == '\n') {
- if (o + 1 < *osize_p)
+ if (put_cr) {
+ put_cr = 0;
+ } else {
output[o++] = '\r';
- else
- break;
+ put_cr = 1;
+ i--;
+ continue;
+ }
}
output[o++] = ch;
}
--
1.7.8.rc3.31.g017d1
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-11-25 15:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-23 17:40 Infinite loop in cascade_filter_fn() Henrik Grubbström
2011-11-25 14:31 ` Carlos Martín Nieto
2011-11-25 15:38 ` Carlos Martín Nieto [this message]
2011-11-25 16:14 ` Henrik Grubbström
2011-11-25 17:02 ` Carlos Martín Nieto
2011-11-26 22:48 ` Junio C Hamano
2011-11-28 10:48 ` Carlos Martín Nieto
2011-11-28 19:18 ` Junio C Hamano
2011-12-16 22:01 ` Junio C Hamano
2011-12-16 22:43 ` [PATCH] lf_to_crlf_filter(): tell the caller we added "\n" when draining Junio C Hamano
2011-12-19 10:19 ` Henrik Grubbström
2011-12-19 20:23 ` Junio C Hamano
2011-12-19 16:42 ` Infinite loop in cascade_filter_fn() Carlos Martín Nieto
2011-11-25 15:43 ` Henrik Grubbström
2011-11-25 15:53 ` Carlos Martín Nieto
2011-11-25 15:59 ` Henrik Grubbström
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111125153829.GB10417@beez.lab.cmartin.tk \
--to=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=grubba@grubba.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).