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 '2620-timezone-offset' into 'main'

Browse Source 
gtimezone: Fix assertion failure when called with a huge offset

Closes #2620

See merge request GNOME/glib!2554
This commit is contained in:
Simon McVittie 2022-03-16 16:23:35 +00:00
commit 2fd4382821
2 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gtimezone.c
View File

@ -2028,7 +2028,13 @@ g_time_zone_new_local (void)
* This is equivalent to calling g_time_zone_new() with a string in the form
* `[+|-]hh[:mm[:ss]]`.
*
* Returns: (transfer full): a timezone at the given offset from UTC
* It is possible for this function to fail if @seconds is too big (greater than
* 24 hours), in which case this function will return the UTC timezone for
* backwards compatibility. To detect failures like this, use
* g_time_zone_new_identifier() directly.
*
* Returns: (transfer full): a timezone at the given offset from UTC, or UTC on
* failure
* Since: 2.58
*/
GTimeZone *
@ -2048,11 +2054,15 @@ g_time_zone_new_offset (gint32 seconds)
(ABS (seconds) / 60) % 60,
ABS (seconds) % 60);
tz = g_time_zone_new_identifier (identifier);
if (tz == NULL)
tz = g_time_zone_new_utc ();
else
g_assert (g_time_zone_get_offset (tz, 0) == seconds);
g_assert (tz != NULL);
g_free (identifier);
g_assert (g_time_zone_get_offset (tz, 0) == seconds);
return tz;
}

48
glib/tests/gdatetime.c
View File

@ -2940,19 +2940,26 @@ test_identifier (void)
static void
test_new_offset (void)
{
const gint32 vectors[] =
const struct
{
-10000,
-3600,
-61,
-60,
-59,
0,
59,
60,
61,
3600,
10000,
gint32 offset;
gboolean expected_success;
}
vectors[] =
{
{ -158400, FALSE },
{ -10000, TRUE },
{ -3600, TRUE },
{ -61, TRUE },
{ -60, TRUE },
{ -59, TRUE },
{ 0, TRUE },
{ 59, TRUE },
{ 60, TRUE },
{ 61, TRUE },
{ 3600, TRUE },
{ 10000, TRUE },
{ 158400, FALSE },
};
gsize i;
@ -2960,12 +2967,21 @@ test_new_offset (void)
{
GTimeZone *tz = NULL;
g_test_message ("Vector %" G_GSIZE_FORMAT ": %d", i, vectors[i]);
g_test_message ("Vector %" G_GSIZE_FORMAT ": %d", i, vectors[i].offset);
tz = g_time_zone_new_offset (vectors[i]);
tz = g_time_zone_new_offset (vectors[i].offset);
g_assert_nonnull (tz);
g_assert_cmpstr (g_time_zone_get_identifier (tz), !=, "UTC");
g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, vectors[i]);
if (vectors[i].expected_success)
{
g_assert_cmpstr (g_time_zone_get_identifier (tz), !=, "UTC");
g_assert_cmpint (g_time_zone_get_offset (tz, 0), ==, vectors[i].offset);
}
else
{
g_assert_cmpstr (g_time_zone_get_identifier (tz), ==, "UTC");
}
g_time_zone_unref (tz);
}
}