moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

[svn] Zero out all of struct tm before passing it to strptime.

This commit is contained in:
hniksic 2005-05-05 14:49:28 -07:00
parent bb60858a3f
commit a231f88b54
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-05-05 Hrvoje Niksic <hniksic@xemacs.org>
* http.c (http_atotm): Zero out the whole struct tm being passed
to strptime.
2005-05-05 Hrvoje Niksic <hniksic@xemacs.org>
* main.c (main): Propagate option name to setoptval.

42
src/http.c
View File

@ -2633,30 +2633,30 @@ http_atotm (const char *time_string)
(google.com uses this for their cookies.) */
"%a %b %d %T %Y" /* asctime: Thu Jan 29 22:12:57 1998 */
};
int i;
struct tm t;
/* According to Roger Beeman, we need to initialize tm_isdst, since
strptime won't do it. */
t.tm_isdst = 0;
/* Note that under foreign locales Solaris strptime() fails to
recognize English dates, which renders this function useless. We
solve this by being careful not to affect LC_TIME when
initializing locale.
Another solution would be to temporarily set locale to C, invoke
strptime(), and restore it back. This is slow and dirty,
however, and locale support other than LC_MESSAGES can mess other
things, so I rather chose to stick with just setting LC_MESSAGES.
GNU strptime does not have this problem because it recognizes
both international and local dates. */
for (i = 0; i < countof (time_formats); i++)
if (check_end (strptime (time_string, time_formats[i], &t)))
return mktime_from_utc (&t);
{
struct tm t;
/* Some versions of strptime use the existing contents of struct
tm to recalculate the date according to format. Zero it out
to prevent garbage from the stack influencing strptime. */
xzero (t);
/* Note that under non-English locales Solaris strptime() fails
to recognize English dates, which renders it useless for this
purpose. We solve this by not setting LC_TIME when
initializing locale. Another solution would be to
temporarily set locale to C, invoke strptime(), and restore
it back, but that is somewhat slow and dirty.
GNU strptime does not have this problem because it recognizes
both international and local dates. */
if (check_end (strptime (time_string, time_formats[i], &t)))
return mktime_from_utc (&t);
}
/* All formats have failed. */
return -1;