diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-26 17:23:15 +0200 |
|---|---|---|
| committer | Andreas Schwab <aschwab@redhat.com> | 2009-06-26 17:38:46 +0200 |
| commit | 851cb78b7d9bc8e2acddcede63d2a38b3177af5c (patch) | |
| tree | 9a294fb55863ce9434055e9af0bd522b4634e1aa | |
| parent | bb8723997676e11a0f7f2b3bf61fedf761da9a2a (diff) | |
Don't generate invalid POSIX TZ string for Asia/Dhaka timezone.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | timezone/zic.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2009-06-26 Andreas Schwab <aschwab@redhat.com> + * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ + string when the timezone ends in DST. + * sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr before call. * sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP): diff --git a/timezone/zic.c b/timezone/zic.c index 01d9f135bd..76df6532a7 100644 --- a/timezone/zic.c +++ b/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; } - if (stdrp == NULL && zp->z_nrules != 0) + if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0)) return; abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar; doabbr(result, zp->z_format, abbrvar, FALSE, TRUE); |