summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Ralls <jralls@ceridwen.us>2016-06-19 15:03:20 -0700
committerJohn Ralls <jralls@ceridwen.us>2016-06-19 15:03:20 -0700
commit35b401c8bb0c7bb9324e7d8ae0e5d0a63f98872c (patch)
tree51d6aded0fb193a5f72c230fc99b9526e8718c25
parentfadd00c7085fd0dc2722c974260768540cc6f8b9 (diff)
downloadglib-35b401c8bb0c7bb9324e7d8ae0e5d0a63f98872c.tar.gz
Bug 767824 - Some UTC timezones incorrectly recognized on Windows 7
The condition removed erroneously excluded UTC-based and DST-less timezones and so left the GArray with no contents, so GTimeZone functions returned whatever random garbage was in memory.
-rw-r--r--glib/gtimezone.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index b61529f56..2e2369c27 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -893,7 +893,7 @@ init_zone_from_rules (GTimeZone *gtz,
++info_index;
skip_first_std_trans = TRUE;
}
- else if (rules[ri].std_offset || rules[ri].dlt_offset)
+ else
{
const guint start_year = rules[ri].start_year;
const guint end_year = rules[ri + 1].start_year;