luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ossfuzz-22758-date-negative-overflow' into 'master'

Browse Source 
gdatetime: Avoid integer overflow creating dates too far in the past

See merge request GNOME/glib!1671
This commit is contained in:
Sebastian Dröge 2020-10-01 11:08:19 +00:00
commit d536afeed8
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gdatetime.c
View File

@ -1032,7 +1032,8 @@ g_date_time_new_from_unix_local (gint64 t)
GDateTime *datetime; GDateTime *datetime;
GTimeZone *local; GTimeZone *local;
if (t > G_MAXINT64 / USEC_PER_SECOND) if (t > G_MAXINT64 / USEC_PER_SECOND ||
t < G_MININT64 / USEC_PER_SECOND)
return NULL; return NULL;
local = g_time_zone_new_local (); local = g_time_zone_new_local ();
@ -1067,7 +1068,8 @@ g_date_time_new_from_unix_utc (gint64 t)
GDateTime *datetime; GDateTime *datetime;
GTimeZone *utc; GTimeZone *utc;
if (t > G_MAXINT64 / USEC_PER_SECOND) if (t > G_MAXINT64 / USEC_PER_SECOND ||
t < G_MININT64 / USEC_PER_SECOND)
return NULL; return NULL;
utc = g_time_zone_new_utc (); utc = g_time_zone_new_utc ();

1
glib/tests/bookmarks/fail-42.xbel Normal file
View File

@ -0,0 +1 @@
<xbel version="1.0"><bookmark href=""><info><metadata owner="http://freedesktop.org"><applications><application name=""exec=""timestamp="-77873021800189">

8
glib/tests/gdatetime.c
View File

@ -152,7 +152,7 @@ test_GDateTime_new_from_unix (void)
g_date_time_unref (dt); g_date_time_unref (dt);
} }
/* Check that trying to create a #GDateTime too far in the future reliably /* Check that trying to create a #GDateTime too far in the future (or past) reliably
* fails. Previously, the checks for this overflowed and it silently returned * fails. Previously, the checks for this overflowed and it silently returned
* an incorrect #GDateTime. */ * an incorrect #GDateTime. */
static void static void
@ -167,6 +167,12 @@ test_GDateTime_new_from_unix_overflow (void)
dt = g_date_time_new_from_unix_local (G_MAXINT64); dt = g_date_time_new_from_unix_local (G_MAXINT64);
g_assert_null (dt); g_assert_null (dt);
dt = g_date_time_new_from_unix_utc (G_MININT64);
g_assert_null (dt);
dt = g_date_time_new_from_unix_local (G_MININT64);
g_assert_null (dt);
} }
static void static void