From: Andreas Schwab <aschwab@redhat.com>
Date: Fri, 26 Jun 2009 15:23:15 +0000 (+0200)
Subject: Don't generate invalid POSIX TZ string for Asia/Dhaka timezone.
X-Git-Tag: fedora/glibc-2.10.90-1~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=851cb78b7d9bc8e2acddcede63d2a38b3177af5c;p=thirdparty%2Fglibc.git

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

diff --git a/ChangeLog b/ChangeLog
index dd08e60249f..14fbf511048 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 01d9f135bd7..76df6532a77 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);