[glib: 1/3] gtimezone: fix inverted ignore_leap param parsing julian day



commit 6cd263f6551abc883ccb98c8d9e8b28992c01ecf
Author: Daniel P. Berrange <berrange redhat com>
Date:   Thu Jan 9 22:37:31 2020 +0000

    gtimezone: fix inverted ignore_leap param parsing julian day
    
    The callers of parse_tz_boundary inverted the value passed
    for the ignore_leap parameter. Fortunately the method impl
    also had an inverted test cancelling out the first bug.
    
    Signed-off-by: Daniel P. Berrange <berrange redhat com>

 glib/gtimezone.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 5d2efcbf3..dd4948e62 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -1234,7 +1234,7 @@ parse_julian_boundary (gchar** pos, TimeZoneDate *boundary,
   boundary->mday = (int) g_date_get_day (&date);
   boundary->wday = 0;
 
-  if (!ignore_leap && day >= 59)
+  if (ignore_leap && day >= 59)
     boundary->mday++;
 
   return TRUE;
@@ -1258,13 +1258,13 @@ parse_tz_boundary (const gchar  *identifier,
   else if (*pos == 'J')
     {
       ++pos;
-      if (!parse_julian_boundary (&pos, boundary, FALSE))
+      if (!parse_julian_boundary (&pos, boundary, TRUE))
         return FALSE ;
     }
   /* Julian date which counts Feb 29 in leap years */
   else if (*pos >= '0' && '9' >= *pos)
     {
-      if (!parse_julian_boundary (&pos, boundary, TRUE))
+      if (!parse_julian_boundary (&pos, boundary, FALSE))
         return FALSE;
     }
   else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]