From: Junio C Hamano <gitster@pobox.com>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: Eric Wong <e@80x24.org>,
git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH 1/2] mailinfo: extract is_from_line from mailsplit
Date: Mon, 25 Jul 2016 11:03:00 -0700 [thread overview]
Message-ID: <xmqqmvl561ez.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <m2poq3zdu3.fsf@linux-m68k.org> (Andreas Schwab's message of "Sun, 24 Jul 2016 09:37:24 +0200")
Andreas Schwab <schwab@linux-m68k.org> writes:
>> + colon = line + len - 2;
>> + line += 5;
>> + for (;;) {
>> + if (colon < line)
>> + return 0;
>> + if (*--colon == ':')
>> + break;
>> + }
>> +
>> + if (!isdigit(colon[-4]) ||
>> + !isdigit(colon[-2]) ||
>> + !isdigit(colon[-1]) ||
>> + !isdigit(colon[ 1]) ||
>> + !isdigit(colon[ 2]))
>> + return 0;
>> +
>> + /* year */
>> + if (strtol(colon+3, NULL, 10) <= 90)
>> + return 0;
>> +
>> + /* Ok, close enough */
>> + return 1;
>> +}
>
> Should this be made more strict, like by checking for a space before the
> year?
The function seems to judge the line to be "close enough" by
checking these places (please view with fixed-width font ;-):
From me Mon Jul 25 01:23:45 2016
xxxxx x xxxxx ....
We only see if the year part is more than 90 but we do not even
ensure that it is at the end of the line without any further
garbage, which I think is probably OK for the purpose of "close
enough".
We also do not bother rejecting a single-digit hour, or there is a
colon between the hour and minute part.
I would say requiring SP between the year and the second, and
requiring colon between hour and minute, would probably be a good
change, i.e. something like this:
if (!isdigit(colon[-4]) ||
colon[-3] != ':' ||
!isdigit(colon[-2]) ||
!isdigit(colon[-1]) ||
!isdigit(colon[ 1]) ||
!isdigit(colon[ 2]) ||
colon[3] != ' ')
would be safe enough without increasing the false negatives too
much.
next prev parent reply other threads:[~2016-07-25 18:03 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-22 22:47 [PATCH] format-patch: escape "From " lines recognized by mailsplit Eric Wong
2016-07-23 8:59 ` Johannes Schindelin
2016-07-24 3:14 ` Eric Wong
2016-07-24 3:15 ` [PATCH 1/2] mailinfo: extract is_from_line from mailsplit Eric Wong
2016-07-24 7:37 ` Andreas Schwab
2016-07-24 8:05 ` Johannes Schindelin
2016-07-24 8:13 ` Andreas Schwab
2016-07-25 18:03 ` Junio C Hamano [this message]
2016-07-24 3:15 ` [PATCH 2/2] format-patch: escape "From " lines recognized by mailsplit Eric Wong
2016-07-24 7:37 ` Johannes Schindelin
2016-07-24 15:30 ` Jeff King
2016-07-24 7:11 ` [PATCH] " Junio C Hamano
2016-07-24 10:58 ` Eric Wong
2016-07-24 15:51 ` Junio C Hamano
2016-07-25 8:43 ` Eric Wong
2016-07-25 17:33 ` Junio C Hamano
2016-07-25 20:49 ` Eric Wong
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=xmqqmvl561ez.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=schwab@linux-m68k.org \
--cc=sunshine@sunshineco.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.
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).