diff options
| author | niq <niq@13f79535-47bb-0310-9956-ffa450edef68> | 2017-09-10 22:30:34 +0000 |
|---|---|---|
| committer | niq <niq@13f79535-47bb-0310-9956-ffa450edef68> | 2017-09-10 22:30:34 +0000 |
| commit | a3e19dd87a1e4f09d89ff4e9540ad9d4aca07d18 (patch) | |
| tree | 132013edfb5134436c84815adbb36891e67cece7 | |
| parent | 26764d8174f738a4369387baf017767bfae77035 (diff) | |
| download | libapr-a3e19dd87a1e4f09d89ff4e9540ad9d4aca07d18.tar.gz | |
Bounds-check human-readable date fields (credit: Stefan Sperling)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.6.x@1807976 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | time/unix/time.c | 3 | ||||
| -rw-r--r-- | time/win32/time.c | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/time/unix/time.c b/time/unix/time.c index dfa45e690..7f0958192 100644 --- a/time/unix/time.c +++ b/time/unix/time.c @@ -142,6 +142,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *t, apr_time_exp_t *xt) static const int dayoffset[12] = {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + if (xt->tm_mon < 0 || xt->tm_mon >= 12) + return APR_EBADDATE; + /* shift new year to 1st March in order to make leap year calc easy */ if (xt->tm_mon < 2) diff --git a/time/win32/time.c b/time/win32/time.c index 234979935..1a705443b 100644 --- a/time/win32/time.c +++ b/time/win32/time.c @@ -54,6 +54,9 @@ static void SystemTimeToAprExpTime(apr_time_exp_t *xt, SYSTEMTIME *tm) static const int dayoffset[12] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; + if (tm->wMonth < 1 || tm->wMonth > 12) + return APR_EBADDATE; + /* Note; the caller is responsible for filling in detailed tm_usec, * tm_gmtoff and tm_isdst data when applicable. */ @@ -224,6 +227,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *t, static const int dayoffset[12] = {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; + if (xt->tm_mon < 0 || xt->tm_mon >= 12) + return APR_EBADDATE; + /* shift new year to 1st March in order to make leap year calc easy */ if (xt->tm_mon < 2) |