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

Merge branch 'six-days-to-eom' into 'master'

Browse Source 
Fix the 6-days-until-the-end-of-the-month bug

Closes #2215

See merge request GNOME/glib!1683
This commit is contained in:
Emmanuele Bassi 2020-10-16 13:47:22 +00:00
commit b5429b7e30
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gtimezone.c
View File

@ -1042,7 +1042,11 @@ find_relative_date (TimeZoneDate *buffer)
/* week is 1 <= w <= 5, we need 0-based */ /* week is 1 <= w <= 5, we need 0-based */
days = 7 * (buffer->week - 1) + wday - first_wday; days = 7 * (buffer->week - 1) + wday - first_wday;
while (days > days_in_month) /* "days" is a 0-based offset from the 1st of the month.
* Adding days == days_in_month would bring us into the next month,
* hence the ">=" instead of just ">".
*/
while (days >= days_in_month)
days -= 7; days -= 7;
g_date_add_days (&date, days); g_date_add_days (&date, days);

38
glib/tests/gdatetime.c
View File

@ -2192,6 +2192,43 @@ test_z (void)
g_time_zone_unref (tz); g_time_zone_unref (tz);
} }
static void
test_6_days_until_end_of_the_month (void)
{
GTimeZone *tz;
GDateTime *dt;
gchar *p;
g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2215");
#ifdef G_OS_UNIX
/* This is the footertz string from `Europe/Paris` from tzdata 2020b. It’s
* used by GLib when the tzdata file was compiled with `zic -b slim`, which is
* the default in tzcode ≥2020b.
*
* The `M10.5.0` part indicates that the summer time end transition happens on
* the Sunday (`0`) in the last week (`5`) of October (`10`). That’s 6 days
* before the end of the month, and hence was triggering issue #2215.
*
* References:
* - https://tools.ietf.org/id/draft-murchison-tzdist-tzif-15.html#rfc.section.3.3
* - https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
*/
tz = g_time_zone_new ("CET-1CEST,M3.5.0,M10.5.0/3");
#elif defined (G_OS_WIN32)
tz = g_time_zone_new ("Romance Standard Time");
#endif
dt = g_date_time_new (tz, 2020, 10, 5, 1, 1, 1);
p = g_date_time_format (dt, "%Y-%m-%d %H:%M:%S%z");
/* Incorrect output is "2020-10-05 01:01:01+0100" */
g_assert_cmpstr (p, ==, "2020-10-05 01:01:01+0200");
g_free (p);
g_date_time_unref (dt);
g_time_zone_unref (tz);
}
static void static void
test_format_iso8601 (void) test_format_iso8601 (void)
{ {
@ -2836,6 +2873,7 @@ main (gint argc,
g_test_add_func ("/GDateTime/new_from_iso8601/2", test_GDateTime_new_from_iso8601_2); g_test_add_func ("/GDateTime/new_from_iso8601/2", test_GDateTime_new_from_iso8601_2);
g_test_add_func ("/GDateTime/new_full", test_GDateTime_new_full); g_test_add_func ("/GDateTime/new_full", test_GDateTime_new_full);
g_test_add_func ("/GDateTime/now", test_GDateTime_now); g_test_add_func ("/GDateTime/now", test_GDateTime_now);
g_test_add_func ("/GDateTime/test-6-days-until-end-of-the-month", test_6_days_until_end_of_the_month);
g_test_add_func ("/GDateTime/printf", test_GDateTime_printf); g_test_add_func ("/GDateTime/printf", test_GDateTime_printf);
g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf); g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf);
g_test_add_func ("/GDateTime/format_unrepresentable", test_format_unrepresentable); g_test_add_func ("/GDateTime/format_unrepresentable", test_format_unrepresentable);