aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--time/tzset.c1
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c915f93c8..11ce0635ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2004-12-06 Jakub Jelinek <jakub@redhat.com>
+
+ * time/tzset.c (tzset_internal): If + or - is seen,
+ but no offset after it, reset offset to 0. [BZ #601]
+
2004-12-06 Ulrich Drepper <drepper@redhat.com>
- * libio/ioseekpos.c (_IO_seekpos_unlocked): Call _IO_SEEKOF not
+ * libio/ioseekpos.c (_IO_seekpos_unlocked): Call _IO_SEEKOFF not
_IO_SEEKPOS, saving one indirect jump.
* libio/fileops.c (_IO_new_file_seekoff): Fix optimization of in-buffer
diff --git a/time/tzset.c b/time/tzset.c
index 48a4e4b140..0479abb38a 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -240,6 +240,7 @@ tzset_internal (always, explicit)
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
{
default:
+ tz_rules[0].offset = 0;
goto out;
case 1:
mm = 0;