From bfa6a811a80d1557b387b2ad2e58e76671bf73a9 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Mon, 7 Nov 2011 22:35:54 +0000 Subject: [PATCH] pull up r25444 from trunk ------------------------------------------------------------------------ r25444 | ghudson | 2011-11-06 00:32:34 -0500 (Sun, 06 Nov 2011) | 10 lines ticket: 7003 subject: Fix month/year units in getdate target_version: 1.10 tags: pullup getdate strings like "1 month" or "next year" would fail some of the time, depending on the value of stack garbage, because DSTcorrect() doesn't set *error on success and RelativeMonth() doesn't initialize error. Make DSTcorrect() responsible for setting *error in all cases. ticket: 7003 version_fixed: 1.10 status: resolved git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25455 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/cli/getdate.y | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kadmin/cli/getdate.y b/src/kadmin/cli/getdate.y index 613bc609c..fc0a403e2 100644 --- a/src/kadmin/cli/getdate.y +++ b/src/kadmin/cli/getdate.y @@ -631,6 +631,7 @@ DSTcorrect(time_t Start, time_t Future, int *error) return -1; } FutureDay = (tm->tm_hour + 1) % 24; + *error = 0; return (Future - Start) + (StartDay - FutureDay) * 60L * 60L; } @@ -873,7 +874,7 @@ get_date(char *p) time_t Start; time_t tod; time_t delta; - int error = 0; + int error; yyInput = p; if (now == NULL) { -- 2.26.2