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

git-mirror · Jun 26, 2009 · 851cb78 · 851cb78
1 parent bb87239
commit 851cb78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);