summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2016-03-17 00:57:45 +0000
committerTom Lane2016-03-17 00:57:45 +0000
commit5db51464311eb7fe4e90030c6a514ff61e9f1c00 (patch)
treea34f927055d270bf90dfe26b0567892dd8f54645
parenta70e13a39eccf5fc944c66e0029004b6abcb3cae (diff)
Fix j2day() to behave sanely for negative Julian dates.
Somebody had apparently once figured that casting to unsigned int would produce the right output for negative inputs, but that would only be true if 2^32 were a multiple of 7, which of course it ain't. We need to use a signed division and then correct the sign of the remainder. AFAICT, the only case where this would arise currently is when doing ISO-week calculations for dates in 4714BC, where we'd compute a negative Julian date representing 4714-01-04BC and then do some arithmetic with it. Since we don't even really document support for such dates, this is not of much consequence. But we may as well get it right. Per report from Vitaly Burovoy.
-rw-r--r--src/backend/utils/adt/datetime.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index 2ea21b7028..46660cfe4a 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -355,14 +355,13 @@ j2date(int jd, int *year, int *month, int *day)
int
j2day(int date)
{
- unsigned int day;
+ date += 1;
+ date %= 7;
+ /* Cope if division truncates towards zero, as it probably does */
+ if (date < 0)
+ date += 7;
- day = date;
-
- day += 1;
- day %= 7;
-
- return (int) day;
+ return date;
} /* j2day() */