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

Make strptime %Z consistent between doc and code. Fixes bug 14876

This commit is contained in:
Ondřej Bílka 2013-10-25 19:04:47 +02:00
parent ca42d35ea1
commit ddc7e412ab
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
NEWS
View File

@ -10,13 +10,13 @@ Version 2.19
* The following bugs are resolved with this release: * The following bugs are resolved with this release:
156, 431, 832, 10278, 13028, 13982, 13985, 14029, 14155, 14547, 14699, 156, 431, 832, 10278, 13028, 13982, 13985, 14029, 14155, 14547, 14699,
14910, 15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522, 15531, 14876, 14910, 15048, 15218, 15277, 15308, 15362, 15400, 15427, 15522,
15532, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680, 15681, 15531, 15532, 15608, 15609, 15610, 15632, 15640, 15670, 15672, 15680,
15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, 15797, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764,
15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15797, 15825, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867,
15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15886, 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919,
15923, 15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036, 16041, 15921, 15923, 15939, 15948, 15963, 15966, 15988, 16032, 16034, 16036,
16072, 16074. 16041, 16072, 16074.
* CVE-2012-4412 The strcoll implementation caches indices and rules for * CVE-2012-4412 The strcoll implementation caches indices and rules for
large collation sequences to optimize multiple passes. This cache large collation sequences to optimize multiple passes. This cache

6
time/strptime_l.c
View File

@ -744,7 +744,11 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
s.want_xday = 1; s.want_xday = 1;
break; break;
case 'Z': case 'Z':
/* XXX How to handle this? */ /* Read timezone but perform no conversion. */
while (ISSPACE (*rp))
rp++;
while (!ISSPACE (*rp) && *rp != '\0')
rp++;
break; break;
case 'z': case 'z':
/* We recognize two formats: if two digits are given, these /* We recognize two formats: if two digits are given, these

1
time/tst-strptime.c
View File

@ -41,6 +41,7 @@ static const struct
{ "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 }, { "C", "19990502123412", "%Y%m%d%H%M%S", 0, 121, 4, 2 },
{ "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 }, { "C", "2001 20 Mon", "%Y %U %a", 1, 140, 4, 21 },
{ "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 }, { "C", "2001 21 Mon", "%Y %W %a", 1, 140, 4, 21 },
{ "C", "2001 EST 21 Mon", "%Y %Z %W %a", 1, 140, 4, 21 },
{ "C", "2012 00 Sun", "%Y %W %a", 0, 0, 0, 1 }, { "C", "2012 00 Sun", "%Y %W %a", 0, 0, 0, 1 },
{ "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p", { "ja_JP.EUC-JP", "2000-01-01 08:12:21 AM", "%Y-%m-%d %I:%M:%S %p",
6, 0, 0, 1 }, 6, 0, 0, 1 },