luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 19:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '878-timezone-transitions' into 'master'

Browse Source 
Resolve "glib uses wrong timezone transition with zoneinfo 2014c"

Closes #878

See merge request GNOME/glib!94
This commit is contained in:
Philip Withnall 2018-06-11 13:48:47 +00:00
commit 8bbc38b497
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/gtimezone.c
View File

@ -1677,7 +1677,10 @@ interval_end (GTimeZone *tz,
guint interval) guint interval)
{ {
if (tz->transitions && interval < tz->transitions->len) if (tz->transitions && interval < tz->transitions->len)
return (TRANSITION(interval)).time - 1; {
gint64 lim = (TRANSITION(interval)).time;
return lim - (lim != G_MININT64);
}
return G_MAXINT64; return G_MAXINT64;
} }