---

yaml
---
r: 86008
b: refs/heads/dist-snap
c: 30fc2c8
h: refs/heads/master
v: v3

Author: poiru

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 617850131b795312c4dd404ae7d853b54d883105
+refs/heads/dist-snap: 30fc2c8df2fc565b20d8df3a202cb0c7d089afd0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/rt/rust_builtin.cpp

@@ -321,13 +321,16 @@ rust_localtime(int64_t sec, int32_t nsec, rust_tm *timeptr) {
     time_t s = sec;
     LOCALTIME(&s, &tm);
 
+    const char* zone = NULL;
 #if defined(__WIN32__)
     int32_t gmtoff = -timezone;
-    char zone[64];
-    strftime(zone, sizeof(zone), "%Z", &tm);
+    char buffer[64];
+    if (strftime(buffer, sizeof(buffer), "%Z", &tm) > 0) {
+        zone = buffer;
+    }
 #else
     int32_t gmtoff = tm.tm_gmtoff;
-    const char *zone = tm.tm_zone;
+    zone = tm.tm_zone;
 #endif
 
     tm_to_rust_tm(&tm, timeptr, gmtoff, zone, nsec);