database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-26 12:21:12 +03:00
Code Activity

Guard against overflow in make_interval().

Browse Source 
The original code did very little to guard against integer or floating
point overflow when computing the interval's fields.  Detect any such
overflows and error out, rather than silently returning bogus results.

Joseph Koshakow, reviewed by Ashutosh Bapat and me.

Discussion: https://postgr.es/m/CAAvxfHcm1TPwH_zaGWuFoL8pZBestbRZTU6Z%3D-RvAdSXTPbKfg%40mail.gmail.com
This commit is contained in:
Dean Rasheed
2023-10-29 15:46:04 +00:00
parent 849172ff48
commit b2d55447a5
4 changed files with 71 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/backend/utils/adt/timestamp.c
View File

@ -1509,24 +1509,41 @@ make_interval(PG_FUNCTION_ARGS)
Interval *result;
/*
* Reject out-of-range inputs. We really ought to check the integer
* inputs as well, but it's not entirely clear what limits to apply.
* Reject out-of-range inputs. We reject any input values that cause
* integer overflow of the corresponding interval fields.
*/
if (isinf(secs) || isnan(secs))
ereport(ERROR,
(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("interval out of range")));
goto out_of_range;
result = (Interval *) palloc(sizeof(Interval));
result->month = years * MONTHS_PER_YEAR + months;
result->day = weeks * 7 + days;
secs = rint(secs * USECS_PER_SEC);
result->time = hours * ((int64) SECS_PER_HOUR * USECS_PER_SEC) +
mins * ((int64) SECS_PER_MINUTE * USECS_PER_SEC) +
(int64) secs;
/* years and months -> months */
if (pg_mul_s32_overflow(years, MONTHS_PER_YEAR, &result->month) ||
pg_add_s32_overflow(result->month, months, &result->month))
goto out_of_range;
/* weeks and days -> days */
if (pg_mul_s32_overflow(weeks, DAYS_PER_WEEK, &result->day) ||
pg_add_s32_overflow(result->day, days, &result->day))
goto out_of_range;
/* hours and mins -> usecs (cannot overflow 64-bit) */
result->time = hours * USECS_PER_HOUR + mins * USECS_PER_MINUTE;
/* secs -> usecs */
secs = rint(float8_mul(secs, USECS_PER_SEC));
if (!FLOAT8_FITS_IN_INT64(secs) ||
pg_add_s64_overflow(result->time, (int64) secs, &result->time))
goto out_of_range;
PG_RETURN_INTERVAL_P(result);
out_of_range:
ereport(ERROR,
errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
errmsg("interval out of range"));
PG_RETURN_NULL(); /* keep compiler quiet */
}
/* EncodeSpecialTimestamp()