NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitb0f24b5

committed

Fix edge-case behavior of pg_next_dst_boundary().

Due to rather sloppy thinking (on my part, I'm afraid) about theappropriate behavior for boundary conditions, pg_next_dst_boundary() gaveundefined, platform-dependent results when the input time is exactly thelast recorded DST transition time for the specified time zone, as a resultof fetching values one past the end of its data arrays.Change its specification to be that it always finds the next DST boundary*after* the input time, and adjust code to match that. The sole existingcaller, DetermineTimeZoneOffset, doesn't actually care about thisdistinction, since it always uses a probe time earlier than the instantthat it does care about. So it seemed best to me to change the API to makethe result=1 and result=0 cases more consistent, specifically to ensurethat the "before" outputs always describe the state at the given time,rather than hacking the code to obey the previous API comment exactly.Per bug #6605 from Sergey Burladyan. Back-patch to all supported versions.

1 parent5969ee4 commitb0f24b5Copy full SHA for b0f24b5

File tree

1 file changed

+12

-11

lines changed

src/timezone
- localtime.c

1 file changed

+12

-11

lines changed

`‎src/timezone/localtime.c`

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1290,20 +1290,21 @@ increment_overflow(int *number, int delta)`
`1290`	`1290`	`}`
`1291`	`1291`
`1292`	`1292`	`/*`
`1293`		`- * Find the next DST transition timeat orafter the given time`
	`1293`	`+ * Find the next DST transition time after the given time`
`1294`	`1294`	`*`
`1295`	`1295`	`* *timep is the input value, the other parameters are output values.`
`1296`	`1296`	`*`
`1297`	`1297`	`* When the function result is 1, *boundary is set to the time_t`
`1298`		`- * representation of the next DST transition timeat orafter *timep,`
	`1298`	`+ * representation of the next DST transition time after *timep,`
`1299`	`1299`	`* before_gmtoff and before_isdst are set to the GMT offset and isdst`
`1300`		`- * state prevailing just before that boundary, and *after_gmtoff and`
`1301`		`- * *after_isdst are set to the state prevailing just after that boundary.`
	`1300`	`+ * state prevailing just before that boundary (in particular, the state`
	`1301`	`+ * prevailing at timep), and after_gmtoff and *after_isdst are set to`
	`1302`	`+ * the state prevailing just after that boundary.`
`1302`	`1303`	`*`
`1303`		`- * When the function result is 0, there is no known DST transition at or`
	`1304`	`+ * When the function result is 0, there is no known DST transition`
`1304`	`1305`	`* after timep, but before_gmtoff and *before_isdst indicate the GMT`
`1305`	`1306`	`* offset and isdst state prevailing at *timep. (This would occur in`
`1306`		`- * DST-less time zones,for example.)`
	`1307`	`+ * DST-less time zones,or if a zone has permanently ceased using DST.)`
`1307`	`1308`	`*`
`1308`	`1309`	`* A function result of -1 indicates failure (this case does not actually`
`1309`	`1310`	`* occur in our current implementation).`
`@@ -1383,16 +1384,16 @@ pg_next_dst_boundary(const pg_time_t *timep,`
`1383`	`1384`	`returnresult;`
`1384`	`1385`	`}`
`1385`	`1386`
`1386`		`-if (t>sp->ats[sp->timecnt-1])`
	`1387`	`+if (t >=sp->ats[sp->timecnt-1])`
`1387`	`1388`	`{`
`1388`		`-/* No known transition >= t, so use last known segment's type */`
	`1389`	`+/* No known transition > t, so use last known segment's type */`
`1389`	`1390`	`i=sp->types[sp->timecnt-1];`
`1390`	`1391`	`ttisp=&sp->ttis[i];`
`1391`	`1392`	`*before_gmtoff=ttisp->tt_gmtoff;`
`1392`	`1393`	`*before_isdst=ttisp->tt_isdst;`
`1393`	`1394`	`return0;`
`1394`	`1395`	`}`
`1395`		`-if (t <=sp->ats[0])`
	`1396`	`+if (t<sp->ats[0])`
`1396`	`1397`	`{`
`1397`	`1398`	`/* For "before", use lowest-numbered standard type */`
`1398`	`1399`	`i=0;`
`@@ -1413,10 +1414,10 @@ pg_next_dst_boundary(const pg_time_t *timep,`
`1413`	`1414`	`*after_isdst=ttisp->tt_isdst;`
`1414`	`1415`	`return1;`
`1415`	`1416`	`}`
`1416`		`-/* Else search to find thecontaining segment */`
	`1417`	`+/* Else search to find theboundary following t */`
`1417`	`1418`	`{`
`1418`	`1419`	`intlo=1;`
`1419`		`-inthi=sp->timecnt;`
	`1420`	`+inthi=sp->timecnt-1;`
`1420`	`1421`
`1421`	`1422`	`while (lo<hi)`
`1422`	`1423`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb0f24b5

File tree

1 file changed

1 file changed

`‎src/timezone/localtime.c`

0 commit comments