qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't generate invalid POSIX TZ string for Asia/Dhaka timezone.

This commit is contained in:
Andreas Schwab 2009-06-26 17:23:15 +02:00
parent bb87239976
commit 851cb78b7d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2009-06-26 Andreas Schwab <aschwab@redhat.com> 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 * sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
before call. before call.
* sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP): * sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):

2
timezone/zic.c
View File

@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037) if (stdrp != NULL && stdrp->r_hiyear == 2037)
return; return;
} }
if (stdrp == NULL && zp->z_nrules != 0) if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
return; return;
abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar; abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
doabbr(result, zp->z_format, abbrvar, FALSE, TRUE); doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);