Merge pull request #207 from ksuther/another-timezone-expansion-fix

Another timezone expansion fix

1 files changed, 10 insertions, 1 deletions

diff --git a/src/libical/icaltimezone.c b/src/libical/icaltimezone.c
index 76923494..9f73e927 100644
--- a/src/libical/icaltimezone.c
+++ b/src/libical/icaltimezone.c
@@ -840,7 +840,7 @@ int icaltimezone_get_utc_offset(icaltimezone *zone, struct icaltimetype *tt, int
             break;
 
         /* If we go past the start of the changes array, then we have no data
-         for this time so we return the prev UTC offset. */
+           for this time so we return the prev UTC offset. */
         if (change_num == 0 && step < 0) {
             if (is_daylight) {
                 *is_daylight = ! tmp_change.is_daylight;
@@ -974,6 +974,15 @@ int icaltimezone_get_utc_offset_of_utc_time(icaltimezone *zone,
         if (step == -1 && found_change == 1)
             break;
 
+        /* If we go past the start of the changes array, then we have no data
+           for this time so we return the prev UTC offset. */
+        if (change_num == 0 && step < 0) {
+            if (is_daylight) {
+                *is_daylight = ! tmp_change.is_daylight;
+            }
+            return tmp_change.prev_utc_offset;
+        }
+
         change_num += step;
 
         if (change_num >= zone->changes->num_elements)