clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import timelib 2022.07 to address OSS fuzz issue

Browse Source
This commit is contained in:
Derick Rethans 2023-04-21 11:29:56 +01:00
parent 439919c91d
commit 629d7740e8
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -17,6 +17,8 @@ PHP NEWS
- Date:
. Fixed bug where the diff() method would not return the right result around
DST changeover for date/times associated with a timezone identifier. (Derick)
. Fixed out-of-range bug when converting to/from around the LONG_MIN unix
timestamp. (Derick)
- DOM:
. Fixed bug #80602 (Segfault when using DOMChildNode::before()).

6
ext/date/lib/timelib.h
View File

@ -30,9 +30,9 @@
# include "timelib_config.h"
#endif
#define TIMELIB_VERSION 202206
#define TIMELIB_EXTENDED_VERSION 20220601
#define TIMELIB_ASCII_VERSION "2022.06"
#define TIMELIB_VERSION 202207
#define TIMELIB_EXTENDED_VERSION 20220701
#define TIMELIB_ASCII_VERSION "2022.07"
#include <stdlib.h>
#include <stdbool.h>

24
ext/date/lib/tm2unixtime.c
View File

@ -32,8 +32,16 @@ static int days_in_month[13] = { 31, 31, 28, 31, 30, 31, 30, 31, 3
static void do_range_limit(timelib_sll start, timelib_sll end, timelib_sll adj, timelib_sll *a, timelib_sll *b)
{
if (*a < start) {
*b -= (start - *a - 1) / adj + 1;
*a += adj * ((start - *a - 1) / adj + 1);
/* We calculate 'a + 1' first as 'start - *a - 1' causes an int64_t overflows if *a is
* LONG_MIN. 'start' is 0 in this context, and '0 - LONG_MIN > LONG_MAX'. */
timelib_sll a_plus_1 = *a + 1;
*b -= (start - a_plus_1) / adj + 1;
/* This code add the extra 'adj' separately, as otherwise this can overflow int64_t in
* situations where *b is near LONG_MIN. */
*a += adj * ((start - a_plus_1) / adj);
*a += adj;
}
if (*a >= end) {
*b += *a / adj;
@ -462,9 +470,15 @@ void timelib_update_ts(timelib_time* time, timelib_tzinfo* tzi)
do_adjust_relative(time);
do_adjust_special(time);
time->sse =
(timelib_epoch_days_from_time(time) * SECS_PER_DAY) +
timelib_hms_to_seconds(time->h, time->i, time->s);
/* You might be wondering, why this code does this in two steps. This is because
* timelib_epoch_days_from_time(time) * SECS_PER_DAY with the lowest limit of
* timelib_epoch_days_from_time() is less than the range of an int64_t. This then overflows. In
* order to be able to still allow for any time in that day that only halfly fits in the int64_t
* range, we add the time element first, which is always positive, and then twice half the value
* of the earliest day as expressed as unix timestamp. */
time->sse = timelib_hms_to_seconds(time->h, time->i, time->s);
time->sse += timelib_epoch_days_from_time(time) * (SECS_PER_DAY / 2);
time->sse += timelib_epoch_days_from_time(time) * (SECS_PER_DAY / 2);
// This modifies time->sse, if needed
do_adjust_timezone(time, tzi);