From 93eb1b8a4782cc403d08ca4d90322a8de13faeab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Fri, 22 Dec 2006 17:28:27 +0000 Subject: [PATCH] Make str2time_t parser more robust. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19489 ec53bebd-3082-4978-b11e-865c3cabbd6b --- kadmin/util.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kadmin/util.c b/kadmin/util.c index 630ba6053..b94dfa50e 100644 --- a/kadmin/util.c +++ b/kadmin/util.c @@ -182,6 +182,7 @@ str2time_t (const char *str, time_t *t) struct tm tm, tm2; memset (&tm, 0, sizeof (tm)); + memset (&tm2, 0, sizeof (tm2)); if(strcasecmp(str, "never") == 0) { *t = 0; @@ -198,10 +199,12 @@ str2time_t (const char *str, time_t *t) if (p == NULL) return -1; + while(isspace((unsigned char)*p)) + p++; /* XXX this is really a bit optimistic, we should really complain 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_min = tm2.tm_min; tm.tm_sec = tm2.tm_sec;