sequencer: don't die() on bogus user-edited timestamp
commit5522bbac2059283f7a91fa367fb1eb75faec2f3d
authorEric Sunshine <sunshine@sunshineco.com>
Tue, 31 Jul 2018 07:33:31 +0000 (31 03:33 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jul 2018 18:35:00 +0000 (31 11:35 -0700)
tree5ade8863b5c0ec9c7a7f2afc6529c3212be9dcd0
parent67f16e3d3fbd1eccda5d1cdb33d04cd087162057
sequencer: don't die() on bogus user-edited timestamp

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c