dect
/
linux-2.6
Archived
13
0
Fork 0

netfilter: xt_time gives a wrong monthday in a leap year

The function localtime_3 in xt_time.c gives a wrong monthday in a leap
year after 28th 2.  calculating monthday should use the array
days_since_leapyear[] not days_since_year[] in a leap year.

Signed-off-by: Kaihui Luo <kaih.luo@gmail.com>
Acked-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Kaihui Luo 2008-09-22 19:02:36 -07:00 committed by David S. Miller
parent 147e70e62f
commit 2cdc55751c
1 changed files with 4 additions and 2 deletions

View File

@ -136,17 +136,19 @@ static void localtime_3(struct xtm *r, time_t time)
* from w repeatedly while counting.)
*/
if (is_leap(year)) {
/* use days_since_leapyear[] in a leap year */
for (i = ARRAY_SIZE(days_since_leapyear) - 1;
i > 0 && days_since_year[i] > w; --i)
i > 0 && days_since_leapyear[i] > w; --i)
/* just loop */;
r->monthday = w - days_since_leapyear[i] + 1;
} else {
for (i = ARRAY_SIZE(days_since_year) - 1;
i > 0 && days_since_year[i] > w; --i)
/* just loop */;
r->monthday = w - days_since_year[i] + 1;
}
r->month = i + 1;
r->monthday = w - days_since_year[i] + 1;
return;
}