diff options
| -rw-r--r-- | libical/ChangeLog | 6 | ||||
| -rw-r--r-- | libical/src/libical/icaltimezone.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/libical/ChangeLog b/libical/ChangeLog index bb4a1e06e0..08d291ee08 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,5 +1,11 @@ 2001-07-30 Damon Chaplin <damon@ximian.com> + * src/libical/icaltimezone.c (icaltimezone_get_builtin_timezone): + changed the debugging message to avoid a crash on non-glibc boxes. + (Using %s with a NULL argument will crash them.) + +2001-07-30 Damon Chaplin <damon@ximian.com> + * src/libical/icalcomponent.c (icalcomponent_merge_vtimezone): copy the TZID just in case the property we got it from gets modified. (icalcomponent_rename_tzids_callback): break out of the loop if we diff --git a/libical/src/libical/icaltimezone.c b/libical/src/libical/icaltimezone.c index 5afb7449f2..92bb9b7c10 100644 --- a/libical/src/libical/icaltimezone.c +++ b/libical/src/libical/icaltimezone.c @@ -1286,7 +1286,8 @@ icaltimezone_get_builtin_timezone (const char *location) int lower, upper, middle, cmp; char *zone_location; - fprintf (stderr, "Getting builtin timezone: %s\n", location); + fprintf (stderr, "Getting builtin timezone: %s\n", + location ? location : "(null)"); if (!location || !location[0]) return NULL; |