[android] fix the tm_zone access, which is nullable on Android (#1056)

swiftlang · Nov 21, 2024 · 156ab32 · 156ab32
1 parent f68fac7
commit 156ab32
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Sources/FoundationEssentials/TimeZone/TimeZone_Cache.swift b/Sources/FoundationEssentials/TimeZone/TimeZone_Cache.swift
@@ -170,7 +170,9 @@ struct TimeZoneCache : Sendable, ~Copyable {
             var lt : tm = tm()
             localtime_r(&t, &lt)
 
-            if let name = String(validatingUTF8: lt.tm_zone) {
+            // tm_zone is nullable on Android.
+            let tm_zone: UnsafePointer<CChar>? = lt.tm_zone
+            if let tm_zone, let name = String(validatingUTF8: tm_zone) {
                 if let result = fixed(name) {
                     return TimeZone(inner: result)
                 }