oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Make str2time_t parser more robust.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19489 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-12-22 17:28:27 +00:00
parent 7d27f2af2c
commit 93eb1b8a47
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kadmin/util.c
View File

@@ -182,6 +182,7 @@ str2time_t (const char *str, time_t *t)
struct tm tm, tm2; struct tm tm, tm2;
memset (&tm, 0, sizeof (tm)); memset (&tm, 0, sizeof (tm));
memset (&tm2, 0, sizeof (tm2));
if(strcasecmp(str, "never") == 0) { if(strcasecmp(str, "never") == 0) {
*t = 0; *t = 0;
@@ -198,10 +199,12 @@ str2time_t (const char *str, time_t *t)
if (p == NULL) if (p == NULL)
return -1; return -1;
while(isspace((unsigned char)*p))
p++;
/* XXX this is really a bit optimistic, we should really complain /* XXX this is really a bit optimistic, we should really complain
if there was a problem parsing the time */ if there was a problem parsing the time */
if(strptime (p, "%t%H:%M:%S", &tm2) != NULL) { if(p[0] != '\0' && strptime (p, "%H:%M:%S", &tm2) != NULL) {
tm.tm_hour = tm2.tm_hour; tm.tm_hour = tm2.tm_hour;
tm.tm_min = tm2.tm_min; tm.tm_min = tm2.tm_min;
tm.tm_sec = tm2.tm_sec; tm.tm_sec = tm2.tm_sec;