luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-14 00:06:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdate: Add overflow precondition checks for g_date_[add|subtract]_*()

Browse Source 
These turn undefined or hard-to-detect misbehaviour into a well-defined
critical warning and early return.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=335731
This commit is contained in:
Philip Withnall 2018-04-12 18:06:03 +01:00
parent cf24867b93
commit 38080bad05
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glib/gdate.c
View File

@ -1667,6 +1667,7 @@ g_date_add_days (GDate *d,
g_date_update_julian (d);
g_return_if_fail (d->julian);
g_return_if_fail (ndays <= G_MAXUINT32 - d->julian_days);
d->julian_days += ndays;
d->dmy = FALSE;
@ -1720,13 +1721,16 @@ g_date_add_months (GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy);
g_return_if_fail (nmonths <= G_MAXUINT - (d->month - 1));
nmonths += d->month - 1;
years = nmonths/12;
months = nmonths%12;
g_return_if_fail (years <= G_MAXUINT16 - d->year);
d->month = months + 1;
d->year += years;
@ -1808,8 +1812,9 @@ g_date_add_years (GDate *d,
if (!d->dmy)
g_date_update_dmy (d);
g_return_if_fail (d->dmy);
g_return_if_fail (d->dmy);
g_return_if_fail (nyears <= G_MAXUINT16 - d->year);
d->year += nyears;
if (d->month == 2 && d->day == 29)