mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

* time/mktime.c (__mktime_internal): If SEC_REQUESTED != SEC,

Browse Source 
convert T2, not T.
	* time/Makefile (tests): Add tst-mktime3.
	* time/tst-mktime3.c: New test.

2004-12-01  Jakub Jelinek  <jakub@redhat.com>
This commit is contained in:
Roland McGrath 2004-12-02 22:16:35 +00:00
parent 469dcb0d46
commit b78ad5fd49
4 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2004-12-01 Jakub Jelinek <jakub@redhat.com>
* time/mktime.c (__mktime_internal): If SEC_REQUESTED != SEC,
convert T2, not T.
* time/Makefile (tests): Add tst-mktime3.
* time/tst-mktime3.c: New test.
2004-12-01 Jakub Jelinek <jakub@redhat.com>
* stdlib/stdlib.h (realpath): Remove nonnull attribute.

3
time/Makefile
View File

@ -34,7 +34,8 @@ aux := era alt_digit lc-time-cleanup
distribute := datemsk
tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime
tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
tst-mktime3
include ../Rules

3
time/mktime.c
View File

@ -463,8 +463,9 @@ __mktime_internal (struct tm *tp,
t2 = t1 + sec_adjustment;
if (((t1 < t) != (sec_requested < 0))
| ((t2 < t1) != (sec_adjustment < 0))
| ! (*convert) (&t, &tm))
| ! (*convert) (&t2, &tm))
return -1;
t = t2;
}
*tp = tm;

50
time/tst-mktime3.c Normal file
View File

@ -0,0 +1,50 @@
/* Test program for mktime bugs with out-of-range tm_sec values. */
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
struct tm tests[] =
{
{ .tm_sec = -1, .tm_mday = 1, .tm_year = 104 },
{ .tm_sec = 65, .tm_min = 59, .tm_hour = 23, .tm_mday = 31,
.tm_mon = 11, .tm_year = 101 }
};
struct tm expected[] =
{
{ .tm_sec = 59, .tm_min = 59, .tm_hour = 23, .tm_mday = 31,
.tm_mon = 11, .tm_year = 103, .tm_wday = 3, .tm_yday = 364 },
{ .tm_sec = 5, .tm_mday = 1, .tm_year = 102, .tm_wday = 2 }
};
int
main (void)
{
setenv ("TZ", "UTC", 1);
int i;
for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i)
{
if (mktime (&tests[i]) < 0)
{
printf ("mktime %d failed\n", i);
return 1;
}
#define CHECK(name) \
if (tests[i].name != expected[i].name) \
{ \
printf ("test %d " #name " got %d expected %d\n", \
i, tests[i].name, expected[i].name); \
return 1; \
}
CHECK (tm_sec)
CHECK (tm_min)
CHECK (tm_hour)
CHECK (tm_mday)
CHECK (tm_mon)
CHECK (tm_year)
CHECK (tm_wday)
CHECK (tm_yday)
CHECK (tm_isdst)
}
return 0;
}