git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Don Zickus <dzickus@redhat.com>
Cc: git@vger.kernel.org, torvalds@linux-foundation.org
Subject: Re: [PATCH] git-mailinfo may corrupt patch headers on attached files
Date: Sun, 06 Jul 2008 17:09:47 -0700	[thread overview]
Message-ID: <7vej66blmc.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1215379261-10802-1-git-send-email-dzickus@redhat.com> (Don Zickus's message of "Sun, 6 Jul 2008 17:21:01 -0400")

> I noticed this the other day, just never got a chance to send the fix out.
> This might be the same problem I ran into.
>
> Cheers,
> Don
>
>  builtin-mailinfo.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c
> index 2894e34..cedda18 100644
> --- a/builtin-mailinfo.c
> +++ b/builtin-mailinfo.c
> @@ -795,7 +795,7 @@ static void handle_body(void)
>  	int rc = 0;
>  	static char newline[2000];
>  	static char *np = newline;
> -	int len = strlen(line);
> +	int len;
>  
>  	/* Skip up to the first boundary */
>  	if (content_top->boundary) {
> @@ -814,6 +814,9 @@ static void handle_body(void)
>  				return;
>  		}
>  
> +		/* line may have changed after handling boundary, check len */
> +		len = strlen(line);
> +
>  		/* Unwrap transfer encoding */
>  		len = decode_transfer_encoding(line, sizeof(line), len);
>  		if (len < 0) {

This does fix the "F\n" issue, but seems to break t5100 test ("respect
NULs").  I haven't looked into the details yet...

  parent reply	other threads:[~2008-07-07  0:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-06 17:47 'git am' breakage with MIME decoding Linus Torvalds
2008-07-06 21:21 ` [PATCH] git-mailinfo may corrupt patch headers on attached files Don Zickus
2008-07-06 21:52   ` Linus Torvalds
2008-07-06 22:13   ` Junio C Hamano
2008-07-07  0:09   ` Junio C Hamano [this message]
2008-07-07  5:19   ` Junio C Hamano
2008-07-07 13:39     ` Don Zickus

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=7vej66blmc.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=dzickus@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=torvalds@linux-foundation.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.
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 NNTP newsgroup(s).