From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"Jeff King" <peff@peff.net>, "René Scharfe" <l.s.r@web.de>,
"Jacob Keller" <jacob.keller@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>
Subject: [PATCH v6 7/8] Abort if the system time cannot handle one of our timestamps
Date: Wed, 26 Apr 2017 21:29:36 +0200 (CEST) [thread overview]
Message-ID: <3f4c005794846ecc80bb4048adda54be2ad23b7a.1493234408.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1493234408.git.johannes.schindelin@gmx.de>
We are about to switch to a new data type for time stamps that is
definitely not smaller or equal, but larger or equal to time_t.
So before using the system functions to process or format timestamps,
let's make extra certain that they can handle what we feed them.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
date.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/date.c b/date.c
index 92ab31aa441..63fa99685e2 100644
--- a/date.c
+++ b/date.c
@@ -46,7 +46,17 @@ static time_t gm_time_t(timestamp_t time, int tz)
minutes = tz < 0 ? -tz : tz;
minutes = (minutes / 100)*60 + (minutes % 100);
minutes = tz < 0 ? -minutes : minutes;
- return time + minutes * 60;
+
+ if (minutes > 0) {
+ if (unsigned_add_overflows(time, minutes * 60))
+ die("Timestamp+tz too large: %"PRItime" +%04d",
+ time, tz);
+ } else if (time < -minutes * 60)
+ die("Timestamp before Unix epoch: %"PRItime" %04d", time, tz);
+ time += minutes * 60;
+ if (date_overflows(time))
+ die("Timestamp too large for this system: %"PRItime, time);
+ return (time_t)time;
}
/*
@@ -70,7 +80,10 @@ static int local_tzoffset(timestamp_t time)
struct tm tm;
int offset, eastwest;
- t = time;
+ if (date_overflows(time))
+ die("Timestamp too large for this system: %"PRItime, time);
+
+ t = (time_t)time;
localtime_r(&t, &tm);
t_local = tm_to_time_t(&tm);
--
2.12.2.windows.2.406.gd14a8f8640f
next prev parent reply other threads:[~2017-04-26 19:29 UTC|newest]
Thread overview: 113+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 21:30 [PATCH 0/6] Use time_t Johannes Schindelin
2017-02-27 21:30 ` [PATCH 1/6] t0006 & t5000: prepare for 64-bit time_t Johannes Schindelin
2017-02-27 22:55 ` Junio C Hamano
2017-02-27 21:30 ` [PATCH 2/6] Specify explicitly where we parse timestamps Johannes Schindelin
2017-02-27 22:37 ` Junio C Hamano
2017-02-27 22:51 ` Junio C Hamano
2017-02-28 10:49 ` Johannes Schindelin
2017-02-27 21:31 ` [PATCH 3/6] Introduce a new "printf format" for timestamps Johannes Schindelin
2017-03-01 18:20 ` Junio C Hamano
2017-03-01 19:53 ` Junio C Hamano
2017-02-27 21:31 ` [PATCH 4/6] Prepare for timestamps to use 64-bit signed types Johannes Schindelin
2017-02-27 21:31 ` [PATCH 5/6] ref-filter: avoid using `unsigned long` for catch-all data type Johannes Schindelin
2017-02-27 21:31 ` [PATCH 6/6] Use time_t where appropriate Johannes Schindelin
2017-02-27 22:48 ` [PATCH 0/6] Use time_t Junio C Hamano
2017-02-28 11:32 ` Johannes Schindelin
2017-02-28 14:28 ` Jeff King
2017-02-28 15:01 ` Johannes Schindelin
2017-02-28 16:38 ` René Scharfe
2017-02-28 18:55 ` Junio C Hamano
2017-02-28 20:04 ` Jeff King
2017-02-28 20:54 ` Johannes Schindelin
2017-02-28 21:31 ` Jeff King
2017-02-28 21:31 ` René Scharfe
2017-02-28 23:10 ` Johannes Schindelin
2017-03-01 0:59 ` René Scharfe
2017-02-28 17:26 ` Junio C Hamano
2017-02-28 20:01 ` Jeff King
2017-02-28 22:27 ` Junio C Hamano
2017-02-28 22:33 ` Jeff King
2017-03-01 17:23 ` Junio C Hamano
2017-04-02 19:06 ` [PATCH v2 0/8] Introduce timestamp_t for timestamps Johannes Schindelin
2017-04-02 19:06 ` [PATCH v2 1/8] ref-filter: avoid using `unsigned long` for catch-all data type Johannes Schindelin
2017-04-03 4:22 ` Torsten Bögershausen
2017-04-03 22:47 ` Johannes Schindelin
2017-04-02 19:06 ` [PATCH v2 2/8] t0006 & t5000: prepare for 64-bit timestamps Johannes Schindelin
2017-04-02 19:06 ` [PATCH v2 3/8] t0006 & t5000: skip "far in the future" test when time_t is too limited Johannes Schindelin
2017-04-02 19:06 ` [PATCH v2 4/8] Specify explicitly where we parse timestamps Johannes Schindelin
2017-04-03 4:26 ` Torsten Bögershausen
2017-04-03 22:50 ` Johannes Schindelin
2017-04-02 19:06 ` [PATCH v2 5/8] Introduce a new "printf format" for timestamps Johannes Schindelin
2017-04-02 19:06 ` [PATCH v2 6/8] Introduce a new data type " Johannes Schindelin
2017-04-02 19:07 ` [PATCH v2 7/8] Abort if the system time cannot handle one of our timestamps Johannes Schindelin
2017-04-02 19:07 ` [PATCH v2 8/8] Use uintmax_t for timestamps Johannes Schindelin
2017-04-20 20:52 ` [PATCH v3 0/8] Introduce timestamp_t " Johannes Schindelin
2017-04-20 20:52 ` [PATCH v3 1/8] ref-filter: avoid using `unsigned long` for catch-all data type Johannes Schindelin
2017-04-20 20:52 ` [PATCH v3 2/8] t0006 & t5000: prepare for 64-bit timestamps Johannes Schindelin
2017-04-20 20:58 ` [PATCH v3 3/8] t0006 & t5000: skip "far in the future" test when time_t is too limited Johannes Schindelin
2017-04-20 20:58 ` [PATCH v3 4/8] Specify explicitly where we parse timestamps Johannes Schindelin
2017-04-20 20:58 ` [PATCH v3 5/8] Introduce a new "printf format" for timestamps Johannes Schindelin
2017-04-20 20:58 ` [PATCH v3 6/8] Introduce a new data type " Johannes Schindelin
2017-04-20 20:58 ` [PATCH v3 7/8] Abort if the system time cannot handle one of our timestamps Johannes Schindelin
2017-04-20 20:59 ` [PATCH v3 8/8] Use uintmax_t for timestamps Johannes Schindelin
2017-04-21 6:05 ` [PATCH v3 0/8] Introduce timestamp_t " Junio C Hamano
2017-04-21 10:44 ` Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 0/9] " Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 1/9] ref-filter: avoid using `unsigned long` for catch-all data type Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 2/9] t0006 & t5000: prepare for 64-bit timestamps Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 3/9] t0006 & t5000: skip "far in the future" test when time_t is too limited Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 4/9] Specify explicitly where we parse timestamps Johannes Schindelin
2017-04-24 3:19 ` Junio C Hamano
2017-04-21 10:45 ` [PATCH v4 5/9] Introduce a new "printf format" for timestamps Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 6/9] Introduce a new data type " Johannes Schindelin
2017-04-21 10:45 ` [PATCH v4 7/9] Abort if the system time cannot handle one of our timestamps Johannes Schindelin
2017-04-24 3:16 ` Junio C Hamano
2017-04-24 13:57 ` Johannes Schindelin
2017-04-25 2:37 ` Junio C Hamano
2017-04-25 3:56 ` Junio C Hamano
2017-04-21 10:46 ` [PATCH v4 8/9] Use uintmax_t for timestamps Johannes Schindelin
2017-04-24 3:24 ` Junio C Hamano
2017-04-24 10:28 ` Johannes Schindelin
2017-04-25 3:59 ` Junio C Hamano
2017-04-25 20:10 ` Johannes Schindelin
2017-04-26 1:52 ` Junio C Hamano
2017-04-26 3:45 ` Junio C Hamano
2017-04-26 9:32 ` Johannes Schindelin
2017-04-26 13:18 ` Junio C Hamano
2017-04-21 10:46 ` [PATCH v4 9/9] show_date_ident(): defer date overflow check Johannes Schindelin
2017-04-24 3:29 ` [PATCH v4 0/9] Introduce timestamp_t for timestamps Junio C Hamano
2017-04-24 6:15 ` Jacob Keller
2017-04-24 14:02 ` Johannes Schindelin
2017-04-24 11:37 ` Jeff King
2017-04-25 20:13 ` Johannes Schindelin
2017-04-24 14:00 ` Johannes Schindelin
2017-04-24 13:57 ` [PATCH v5 0/8] " Johannes Schindelin
2017-04-24 13:57 ` [PATCH v5 1/8] ref-filter: avoid using `unsigned long` for catch-all data type Johannes Schindelin
2017-04-24 13:57 ` [PATCH v5 2/8] t0006 & t5000: prepare for 64-bit timestamps Johannes Schindelin
2017-04-24 13:58 ` [PATCH v5 3/8] t0006 & t5000: skip "far in the future" test when time_t is too limited Johannes Schindelin
2017-04-24 13:58 ` [PATCH v5 4/8] Specify explicitly where we parse timestamps Johannes Schindelin
2017-04-25 5:59 ` Junio C Hamano
2017-04-24 13:58 ` [PATCH v5 5/8] Introduce a new "printf format" for timestamps Johannes Schindelin
2017-04-24 13:58 ` [PATCH v5 6/8] Introduce a new data type " Johannes Schindelin
2017-04-26 16:43 ` Johannes Sixt
2017-04-26 19:18 ` Johannes Schindelin
2017-04-26 22:32 ` René Scharfe
2017-04-24 13:58 ` [PATCH v5 7/8] Abort if the system time cannot handle one of our timestamps Johannes Schindelin
2017-04-24 13:58 ` [PATCH v5 8/8] Use uintmax_t for timestamps Johannes Schindelin
2017-04-26 16:36 ` Johannes Sixt
2017-04-26 19:09 ` Johannes Schindelin
2017-04-25 21:54 ` [PATCH v5 0/8] Introduce timestamp_t " René Scharfe
2017-04-25 22:22 ` Johannes Schindelin
2017-04-26 22:09 ` René Scharfe
2017-04-26 1:56 ` Junio C Hamano
2017-04-26 19:20 ` [PATCH v6 " Johannes Schindelin
2017-04-26 19:26 ` [PATCH v6 1/8] ref-filter: avoid using `unsigned long` for catch-all data type Johannes Schindelin
2017-04-26 19:26 ` [PATCH v6 2/8] t0006 & t5000: prepare for 64-bit timestamps Johannes Schindelin
2017-04-26 19:26 ` [PATCH v6 3/8] t0006 & t5000: skip "far in the future" test when time_t is too limited Johannes Schindelin
2017-04-26 19:26 ` [PATCH v6 4/8] Specify explicitly where we parse timestamps Johannes Schindelin
2017-04-26 19:29 ` [PATCH v6 5/8] Introduce a new "printf format" for timestamps Johannes Schindelin
2017-04-26 19:29 ` [PATCH v6 6/8] Introduce a new data type " Johannes Schindelin
2017-05-20 5:47 ` [PATCH] name-rev: change a "long" variable to timestamp_t Junio C Hamano
2017-05-22 13:39 ` Johannes Schindelin
2017-04-26 19:29 ` Johannes Schindelin [this message]
2017-04-26 19:29 ` [PATCH v6 8/8] Use uintmax_t for timestamps Johannes Schindelin
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=3f4c005794846ecc80bb4048adda54be2ad23b7a.1493234408.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=jacob.keller@gmail.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
--cc=tboegi@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.
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).