Skip to content

Commit

Permalink
Bounds-check human-readable date fields (credit: Stefan Sperling)
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1807975 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Nick Kew committed Sep 10, 2017
1 parent 55e518c commit ad95838
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions time/unix/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions time/win32/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ad95838

Please sign in to comment.