diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2009-08-18 21:23:14 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2009-08-18 21:23:14 +0000 |
| commit | 3bd2241135d18767cf40fc9a39a4afd4ce3ff3a6 (patch) | |
| tree | 9aaddf6680f557ac82d461b6d8175d326057dc11 /src/backend/utils | |
| parent | e31b35faa5f1971ad847f238b6893fb805b74065 (diff) | |
| download | postgresql-3bd2241135d18767cf40fc9a39a4afd4ce3ff3a6.tar.gz postgresql-3bd2241135d18767cf40fc9a39a4afd4ce3ff3a6.zip | |
Fix overflow for INTERVAL 'x ms' where x is more than a couple million,
and integer datetimes are in use. Per bug report from Hubert Depesz
Lubaczewski.
Alex Hunsaker
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/adt/datetime.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index 186522148d5..6f0f5ce9863 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.208 2009/06/11 14:49:03 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.209 2009/08/18 21:23:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2986,6 +2986,9 @@ DecodeInterval(char **field, int *ftype, int nf, int range, break; case DTK_MILLISEC: + /* avoid overflowing the fsec field */ + tm->tm_sec += val / 1000; + val -= (val / 1000) * 1000; #ifdef HAVE_INT64_TIMESTAMP *fsec += rint((val + fval) * 1000); #else |