diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-02-09 01:33:57 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-02-09 01:33:57 +0000 |
| commit | 00458b5bee15b31f90bca83c79f29e168f04ecc8 (patch) | |
| tree | 8a74a80513dfde2c71f975ff4fa024e5abe99279 /time/strptime_l.c | |
| parent | 784aacea3cdce36a6baef08cd504b89c1434fea9 (diff) | |
[BZ #3944]
2007-02-08 Jakub Jelinek <jakub@redhat.com>
[BZ #3944]
* time/strptime_l.c (__strptime_internal): Set have_mon for
%b/%B/%h. Set have_mon and have_mday if tm_mon and tm_mday
have been computed from tm_yday and tm_year. Don't crash
in day_of_the_week or day_of_the_year if not have_mon
and tm_mon contains bogus value.
* time/Makefile (tests): Add tst-strptime3.
* time/tst-strptime3.c: New test.
Diffstat (limited to 'time/strptime_l.c')
| -rw-r--r-- | time/strptime_l.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/time/strptime_l.c b/time/strptime_l.c index dc0cc686fd..443a6fa88e 100644 --- a/time/strptime_l.c +++ b/time/strptime_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -400,6 +400,7 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) /* Does not match a month name. */ return NULL; tm->tm_mon = cnt; + have_mon = 1; want_xday = 1; break; case 'c': @@ -1085,11 +1086,15 @@ __strptime_internal (rp, fmt, tm, decided, era_cnt LOCALE_PARAM) tm->tm_mday = (tm->tm_yday - __mon_yday[__isleap(1900 + tm->tm_year)][t_mon - 1] + 1); + have_mon = 1; + have_mday = 1; } - day_of_the_week (tm); + /* Don't crash in day_of_the_week if tm_mon is uninitialized. */ + if (have_mon || (unsigned) tm->tm_mon <= 11) + day_of_the_week (tm); } - if (want_xday && !have_yday) + if (want_xday && !have_yday && (have_mon || (unsigned) tm->tm_mon <= 11)) day_of_the_year (tm); if ((have_uweek || have_wweek) && have_wday) |