git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Charles Bailey <cbailey32@bloomberg.net>, git@vger.kernel.org
Subject: Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime
Date: Fri, 28 Mar 2014 14:47:10 -0400	[thread overview]
Message-ID: <20140328184710.GA29987@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqd2h6cm26.fsf@gitster.dls.corp.google.com>

On Fri, Mar 28, 2014 at 09:41:53AM -0700, Junio C Hamano wrote:

> Offhand, the three possible failure modes this thread identified
> sounds to me like the only plausible ones, and I think the best way
> forward might be to
> 
>  - teach the "is the result sane, even though we may have got a
>    non-NULL from gmtime?  otherwise let's signal a failure by
>    replacing it with a known sentinel value" codepath the new
>    failure mode Charles's report suggests---if we feed a positive
>    timestamp and gmtime gave us back a tm_year+1900 < 0, that is
>    certainly an overflow; and

I don't think we can analyze the output from gmtime. If it wraps the
year at N, then won't N+2014 look like a valid value?

If we are going to do something trustworthy I think it has to be before
we hand off to gmtime. Like:

diff --git a/date.c b/date.c
index e1a2cee..e0c43c4 100644
--- a/date.c
+++ b/date.c
@@ -57,6 +57,8 @@ static time_t gm_time_t(unsigned long time, int tz)
 static struct tm *time_to_tm(unsigned long time, int tz)
 {
 	time_t t = gm_time_t(time, tz);
+	if (t > 9999999999999999)
+		return NULL;
 	return gmtime(&t);
 }

I suspect that would handle the FreeBSD case, as well.

By the way, I have a suspicion that the gm_time_t above can overflow if
you specially craft a value at the edge of what time_t can handle (we
check that our value will not overflow time_t earlier, but now we might
be adding up to 86400 seconds to it). <sigh>

-Peff

  reply	other threads:[~2014-03-28 18:47 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-24  7:33 [PATCH 0/5] handle bogus commit dates Jeff King
2014-02-24  7:36 ` [PATCH 1/5] t4212: test bogus timestamps with git-log Jeff King
2014-02-24  7:39 ` [PATCH 2/5] fsck: report integer overflow in author timestamps Jeff King
2014-02-24  7:39 ` [PATCH 3/5] date: check date overflow against time_t Jeff King
2014-02-24  7:46 ` [PATCH 4/5] log: handle integer overflow in timestamps Jeff King
2014-02-24 19:50   ` Junio C Hamano
2014-02-24 19:58     ` Jeff King
2014-02-24 20:21       ` Junio C Hamano
2014-02-24 20:37         ` Jeff King
2014-02-24 21:01           ` Junio C Hamano
2014-02-24  7:49 ` [PATCH 5/5] log: do not segfault on gmtime errors Jeff King
2014-03-22  9:32   ` René Scharfe
2014-03-24 21:33     ` Jeff King
2014-03-24 22:03       ` René Scharfe
2014-03-24 22:11         ` Jeff King
2014-03-26 11:05   ` Charles Bailey
2014-03-26 18:21     ` Jeff King
2014-03-26 18:51       ` [PATCH] t4212: handle systems with post-apocalyptic gmtime Jeff King
2014-03-26 19:18         ` Junio C Hamano
2014-03-26 19:25           ` Jeff King
2014-03-26 19:33             ` Jeff King
2014-03-26 19:40               ` Jeff King
2014-03-26 20:36                 ` Charles Bailey
2014-03-26 20:38                   ` Jeff King
2014-03-26 20:41                     ` Charles Bailey
2014-03-26 21:22               ` Charles Bailey
2014-03-26 21:57                 ` Jeff King
2014-03-26 22:46                   ` Charles Bailey
2014-03-27 22:48                     ` Jeff King
2014-03-28 16:41                       ` Junio C Hamano
2014-03-28 18:47                         ` Jeff King [this message]
2014-03-28 19:02                           ` Junio C Hamano
2014-03-28 19:05                             ` Jeff King
2014-03-28 19:30                               ` Junio C Hamano
2014-04-01  7:38                                 ` Jeff King
2014-04-01  7:42                                   ` [PATCH 1/2] date: recognize bogus FreeBSD gmtime output Jeff King
2014-04-01 17:42                                     ` René Scharfe
2014-04-01 19:08                                       ` Junio C Hamano
2014-04-01 21:17                                         ` René Scharfe
2014-04-01 21:28                                           ` Jeff King
2014-04-01  7:43                                   ` [PATCH 2/2] t4212: loosen far-in-future test for AIX Jeff King
2014-04-01  7:45                                   ` [PATCH 2alt/2] work around unreliable gmtime errors on AIX Jeff King
2014-04-01 19:07                                   ` [PATCH] t4212: handle systems with post-apocalyptic gmtime Junio C Hamano
2014-04-01 19:46                                     ` Jeff King
2014-03-26 18:58       ` [PATCH 5/5] log: do not segfault on gmtime errors Junio C Hamano
2014-03-26 19:01         ` Jeff King
2014-03-26 21:01           ` Junio C Hamano
2014-03-26 21:09             ` Jeff King

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=20140328184710.GA29987@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=cbailey32@bloomberg.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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.
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).