diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-01 12:12:25 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-01 12:12:25 +0000 |
commit | a4460ddb484979df59a1ff813c32cdf0861821d6 (patch) | |
tree | 2fbe99e7f8d0d32d2bc04fc73371cc45e35804e9 | |
parent | bd14f5bf948d09497c8cad94164f472bbbe94db1 (diff) |
* time.c (localtime_with_gmtoff_zone): musl libc may return NULL for
tm_zone.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | time.c | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed May 1 21:11:17 2013 Tanaka Akira <akr@fsij.org> + + * time.c (localtime_with_gmtoff_zone): musl libc may return NULL for + tm_zone. + Wed May 1 18:59:36 2013 Benoit Daloze <eregontp@gmail.com> * enum.c (Enumerable#chunk): fix grammar of error message @@ -1697,7 +1697,10 @@ localtime_with_gmtoff_zone(const time_t *t, struct tm *result, long *gmtoff, con if (zone) { #if defined(HAVE_TM_ZONE) - *zone = zone_str(tm.tm_zone); + if (tm.tm_zone) + *zone = zone_str(tm.tm_zone); + else + *zone = zone_str("(NO-TIMEZONE-ABBREVIATION)"); #elif defined(HAVE_TZNAME) && defined(HAVE_DAYLIGHT) /* this needs tzset or localtime, instead of localtime_r */ *zone = zone_str(tzname[daylight && tm.tm_isdst]); |