Commit3bd2241

committed

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 DepeszLubaczewski.Alex Hunsaker

1 parente31b35f commit3bd2241Copy full SHA for 3bd2241

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.208 2009/06/11 14:49:03 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/datetime.c,v 1.209 2009/08/18 21:23:14 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2986,6 +2986,9 @@ DecodeInterval(char *field, int ftype, int nf, int range,`
`2986`	`2986`	`break;`
`2987`	`2987`
`2988`	`2988`	`caseDTK_MILLISEC:`
	`2989`	`+/* avoid overflowing the fsec field */`
	`2990`	`+tm->tm_sec+=val /1000;`
	`2991`	`+val-= (val /1000)*1000;`
`2989`	`2992`	`#ifdefHAVE_INT64_TIMESTAMP`
`2990`	`2993`	`fsec+=rint((val+fval)1000);`
`2991`	`2994`	`#else`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2009, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.80 2009/06/11 14:49:13 momjian Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/include/utils/timestamp.h,v 1.81 2009/08/18 21:23:14 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -39,6 +39,8 @@`
`39`	`39`	`* TimeOffset and fsec_t are convenience typedefs for temporary variables`
`40`	`40`	`* that are of different types in the two cases. Do not use fsec_t in values`
`41`	`41`	`* stored on-disk, since it is not the same size in both implementations.`
	`42`	`+ * Also, fsec_t is only meant for fractional seconds; beware of overflow`
	`43`	`+ * if the value you need to store could be many seconds.`
`42`	`44`	`*/`
`43`	`45`
`44`	`46`	`#ifdefHAVE_INT64_TIMESTAMP`

Comments

(0)