From: Eric Sunshine <sunshine@sunshineco.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood@talktalk.net>,
Akinori MUSHA <knu@idaemons.org>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v2 4/4] sequencer: don't die() on bogus user-edited timestamp
Date: Tue, 31 Jul 2018 03:33:31 -0400 [thread overview]
Message-ID: <20180731073331.40007-5-sunshine@sunshineco.com> (raw)
In-Reply-To: <20180731073331.40007-1-sunshine@sunshineco.com>
read_author_ident() is careful to handle errors "gently" when parsing
"rebase-merge/author-script" by printing a suitable warning and
returning NULL; it never die()'s. One possible reason that parsing might
fail is that "rebase-merge/author-script" has been hand-edited in such a
way which corrupts it or the information it contains.
However, read_author_ident() invokes fmt_ident() which is not so careful
about failing "gently". It will die() if it encounters a malformed
timestamp. Since read_author_ident() doesn't want to die() and since
it's dealing with possibly hand-edited data, take care to avoid passing
a bogus timestamp to fmt_ident().
A more "correctly engineered" fix would be to add a "gentle" version of
fmt_ident(), however, such a change it outside the scope of the bug-fix
series. If fmt_ident() ever does grow a "gentle" cousin, then the manual
timestamp check added here can be retired.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---
sequencer.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/sequencer.c b/sequencer.c
index 15a66a334c..9b6cdb6ff8 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -742,6 +742,15 @@ static const char *read_author_ident(struct strbuf *buf)
return NULL;
}
+ /* validate date since fmt_ident() will die() on bad value */
+ if (parse_date(val[2], &out)){
+ warning(_("invalid date format '%s' in '%s'"),
+ val[2], rebase_path_author_script());
+ strbuf_release(&out);
+ return NULL;
+ }
+
+ strbuf_reset(&out);
strbuf_addstr(&out, fmt_ident(val[0], val[1], val[2], 0));
strbuf_swap(buf, &out);
strbuf_release(&out);
--
2.18.0.267.gbc8be36ecb
next prev parent reply other threads:[~2018-07-31 7:34 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 7:33 [PATCH v2 0/4] fix "rebase -i --root" corrupting root commit Eric Sunshine
2018-07-31 7:33 ` [PATCH v2 1/4] sequencer: fix "rebase -i --root" corrupting author header Eric Sunshine
2018-07-31 7:33 ` [PATCH v2 2/4] sequencer: fix "rebase -i --root" corrupting author header timezone Eric Sunshine
2018-07-31 9:50 ` Phillip Wood
2018-07-31 10:15 ` Eric Sunshine
2018-07-31 7:33 ` [PATCH v2 3/4] sequencer: fix "rebase -i --root" corrupting author header timestamp Eric Sunshine
2018-07-31 10:00 ` Phillip Wood
2018-07-31 10:30 ` Eric Sunshine
2018-07-31 7:33 ` Eric Sunshine [this message]
2018-07-31 10:02 ` [PATCH v2 4/4] sequencer: don't die() on bogus user-edited timestamp Phillip Wood
2018-07-31 10:38 ` Eric Sunshine
2018-07-31 10:05 ` [PATCH v2 0/4] fix "rebase -i --root" corrupting root commit Phillip Wood
2018-07-31 10:46 ` Eric Sunshine
2018-07-31 11:19 ` Phillip Wood
2018-07-31 11:27 ` Eric Sunshine
2018-07-31 11:15 ` [PATCH v2 0/2] Fix author script quoting Phillip Wood
2018-07-31 11:15 ` [PATCH v2 1/2] sequencer: handle errors in read_author_ident() Phillip Wood
2018-07-31 20:47 ` Eric Sunshine
2018-08-01 9:28 ` Phillip Wood
2018-07-31 11:15 ` [PATCH v2 2/2] sequencer: fix quoting in write_author_script Phillip Wood
2018-07-31 21:39 ` Eric Sunshine
2018-08-01 10:24 ` Phillip Wood
2018-08-01 15:22 ` Junio C Hamano
2018-08-01 15:50 ` Phillip Wood
2018-08-01 19:19 ` Eric Sunshine
2018-08-01 1:30 ` [PATCH v2 0/4] fix "rebase -i --root" corrupting root commit Hilco Wijbenga
2018-08-01 6:22 ` Eric Sunshine
2018-08-07 1:19 ` Hilco Wijbenga
2018-08-07 3:31 ` Eric Sunshine
2018-08-07 21:09 ` Junio C Hamano
2018-08-27 22:34 ` Johannes Schindelin
2018-08-01 23:25 ` brian m. carlson
2018-08-02 8:09 ` Eric Sunshine
2018-08-02 11:20 ` [PATCH v3 0/2] Fix author script quoting Phillip Wood
2018-08-02 11:20 ` [PATCH v3 1/2] sequencer: handle errors in read_author_ident() Phillip Wood
2018-08-03 7:09 ` Eric Sunshine
2018-08-03 15:53 ` Junio C Hamano
2018-08-02 11:20 ` [PATCH v3 2/2] sequencer: fix quoting in write_author_script Phillip Wood
2018-08-02 17:27 ` Junio C Hamano
2018-08-03 7:59 ` Eric Sunshine
2018-08-03 9:33 ` Phillip Wood
2018-08-03 10:02 ` Eric Sunshine
2018-08-03 14:12 ` Phillip Wood
2018-08-07 17:20 ` Junio C Hamano
2018-08-07 9:34 ` [PATCH v4 0/2] fix author-script quoting Phillip Wood
2018-08-07 9:34 ` [PATCH v4 1/2] sequencer: handle errors from read_author_ident() Phillip Wood
2018-08-08 9:43 ` Eric Sunshine
2018-08-07 9:34 ` [PATCH v4 2/2] sequencer: fix quoting in write_author_script Phillip Wood
2018-08-07 10:23 ` Eric Sunshine
2018-08-07 13:54 ` Phillip Wood
2018-08-08 8:43 ` Eric Sunshine
2018-08-08 16:01 ` Junio C Hamano
2018-08-09 10:06 ` Phillip Wood
2018-08-09 10:08 ` Phillip Wood
2018-08-08 9:39 ` Eric Sunshine
2018-08-09 10:11 ` Phillip Wood
2018-08-08 9:51 ` [PATCH v4 0/2] fix author-script quoting Eric Sunshine
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=20180731073331.40007-5-sunshine@sunshineco.com \
--to=sunshine@sunshineco.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=knu@idaemons.org \
--cc=phillip.wood@talktalk.net \
/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).