openkylin
/
apr
mirror of https://gitee.com/openkylin/apr.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

SECURITY: CVE-2021-35940 (cve.mitre.org) 

Origin: upstream, https://svn.apache.org/viewvc?view=revision&revision=1891198
Bug-Debian: https://bugs.debian.org/992789
Forwarded: not-needed
Last-Update: 2021-08-20

Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
was addressed in 1.6.x in 1.6.3 and later via r1807976.

The fix was merged back to 1.7.x in r1891198.

Since this was a regression in 1.7.0, a new CVE name has been assigned
to track this, CVE-2021-35940.

Gbp-Pq: Name CVE-2021-35940.patch
This commit is contained in:
OpenKylin Developers 2023-01-16 15:55:45 +08:00 committed by zhouganqing
parent 1871ed3f97
commit 699ce709af
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
time/unix/time.c
View File

@ -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] = static const int dayoffset[12] =
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; {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 */ /* shift new year to 1st March in order to make leap year calc easy */
if (xt->tm_mon < 2) if (xt->tm_mon < 2)

6
time/win32/time.c
View File

@ -54,6 +54,9 @@ static void SystemTimeToAprExpTime(apr_time_exp_t *xt, SYSTEMTIME *tm)
static const int dayoffset[12] = static const int dayoffset[12] =
{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}; {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, /* Note; the caller is responsible for filling in detailed tm_usec,
* tm_gmtoff and tm_isdst data when applicable. * tm_gmtoff and tm_isdst data when applicable.
*/ */
@ -228,6 +231,9 @@ APR_DECLARE(apr_status_t) apr_time_exp_get(apr_time_t *t,
static const int dayoffset[12] = static const int dayoffset[12] =
{306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275}; {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 */ /* shift new year to 1st March in order to make leap year calc easy */
if (xt->tm_mon < 2) if (xt->tm_mon < 2)