From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "René Scharfe" <l.s.r@web.de>,
"Charles Bailey" <cbailey32@bloomberg.net>,
git@vger.kernel.org
Subject: [PATCH 2alt/2] work around unreliable gmtime errors on AIX
Date: Tue, 1 Apr 2014 03:45:59 -0400 [thread overview]
Message-ID: <20140401074559.GA22591@sigill.intra.peff.net> (raw)
In-Reply-To: <20140401073848.GA22023@sigill.intra.peff.net>
AIX's gmtime will happily overflow the tm_year field. Let's
catch this error before handing the value to gmtime.
Signed-off-by: Jeff King <peff@peff.net>
---
This is an alternative to loosening the test in t4212.
It's really not _that_ ugly. The "LL" here may not be portable, though.
32-bit systems can't represent this timestamp at all (so they're safe),
but I don't know what would be the best way to conditionally compile
here.
compat/gmtime.c | 10 ++++++++++
config.mak.uname | 1 +
2 files changed, 11 insertions(+)
diff --git a/compat/gmtime.c b/compat/gmtime.c
index 75a5835..f95ba50 100644
--- a/compat/gmtime.c
+++ b/compat/gmtime.c
@@ -12,6 +12,16 @@ struct tm *git_gmtime_r(const time_t *timep, struct tm *result)
{
struct tm *ret;
+ /*
+ * Some systems, like AIX, will happily overflow the tm_year field.
+ * So let's recognize obviously out-of-bound data before it hits gmtime
+ * and just mark it as an error. This date is ~316 million years in the
+ * future, which is far enough that nobody should care, but close
+ * enough for the year to fit into a 32-bit tm_year.
+ */
+ if (*timep > 9999999999999999LL)
+ return NULL;
+
ret = gmtime_r(timep, result);
/*
diff --git a/config.mak.uname b/config.mak.uname
index 0e22ac0..c1110ad 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -236,6 +236,7 @@ ifeq ($(uname_S),AIX)
INLINE = ''
endif
GIT_TEST_CMP = cmp
+ GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
endif
ifeq ($(uname_S),GNU)
# GNU/Hurd
--
1.9.1.656.ge8a0637
next prev parent reply other threads:[~2014-04-01 7:46 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
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 ` Jeff King [this message]
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=20140401074559.GA22591@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=cbailey32@bloomberg.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
/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).