aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2009-02-05 20:09:58 +0000
committerUlrich Drepper <drepper@redhat.com>2009-02-05 20:09:58 +0000
commit970aa10f95b3e289e5814e6c83d483a05e56c21c (patch)
tree0439a500d4ded00359ba5da9b35c92f569af6a0d
parent52de761a93b7306f6efb002e90b89cba1fd8c5f2 (diff)
downloadglibc-970aa10f95b3e289e5814e6c83d483a05e56c21c.tar
glibc-970aa10f95b3e289e5814e6c83d483a05e56c21c.tar.gz
glibc-970aa10f95b3e289e5814e6c83d483a05e56c21c.tar.bz2
glibc-970aa10f95b3e289e5814e6c83d483a05e56c21c.zip
* time/tzset.c (__tzset_parse_tz): DST offset must also allow hour
value of 24.
-rw-r--r--ChangeLog3
-rw-r--r--time/tzset.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index caafea3155..fde04bfd0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2009-02-05 Ulrich Drepper <drepper@redhat.com>
+ * time/tzset.c (__tzset_parse_tz): DST offset must also allow hour
+ value of 24.
+
* intl/dcigettext.c (DCIGETTEXT): Avoid some code duplication.
* sysdeps/unix/opendir.c (__alloc_dir): We have a lot more memory
diff --git a/time/tzset.c b/time/tzset.c
index a6fed4abc1..45d70518a8 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002,2003,2004,2007 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2002,2003,2004,2007,2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -244,7 +244,7 @@ __tzset_parse_tz (tz)
ss = 0;
case 3:
tz_rules[1].offset *= (min (ss, 59) + (min (mm, 59) * 60) +
- (min (hh, 23) * (60 * 60)));
+ (min (hh, 24) * (60 * 60)));
break;
}
for (l = 0; l < 3; ++l)