Updated GetTimeZoneName() to return "" if localtime_r fails or has a NULL for its tm_zone value, li…

runtime/vm/os_win.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/os.h"
 
 #include <time.h>
 
 #include "platform/assert.h"
 
@@ skipping 18 matching lines @@
   } else {
     return static_cast<int>(zone_information.DaylightBias * 60);
   }
 }
 
 
 const char* OS::GetTimeZoneName(int64_t seconds_since_epoch) {
   tm decomposed;
   // LocalTime will set _tzname.
   bool succeeded = LocalTime(seconds_since_epoch, &decomposed);
-  ASSERT(succeeded);
-  int inDaylightSavingsTime = decomposed.tm_isdst;
-  ASSERT(inDaylightSavingsTime == 0 || inDaylightSavingsTime == 1);
-  return _tzname[inDaylightSavingsTime];
+  if (succeeded) {
+    int inDaylightSavingsTime = decomposed.tm_isdst;
+    ASSERT(inDaylightSavingsTime == 0 || inDaylightSavingsTime == 1);
+    return _tzname[inDaylightSavingsTime];
+  } else {
+    // Return an empty string like V8 does.
+    return "";
+  }
 }
 
 
 int OS::GetTimeZoneOffsetInSeconds(int64_t seconds_since_epoch) {
   tm decomposed;
   // LocalTime will set _timezone.
   bool succeeded = LocalTime(seconds_since_epoch, &decomposed);
-  ASSERT(succeeded);
-  int inDaylightSavingsTime = decomposed.tm_isdst;
-  ASSERT(inDaylightSavingsTime == 0 || inDaylightSavingsTime == 1);
-  // Dart and Windows disagree on the sign of the bias.
-  int offset = static_cast<int>(-_timezone);
-  if (inDaylightSavingsTime == 1) {
-    static int daylight_bias = GetDaylightSavingBiasInSeconds();
-    // Subtract because windows and Dart disagree on the sign.
-    offset = offset - daylight_bias;
+  if (succeeded) {
+    int inDaylightSavingsTime = decomposed.tm_isdst;
+    ASSERT(inDaylightSavingsTime == 0 || inDaylightSavingsTime == 1);
+    // Dart and Windows disagree on the sign of the bias.
+    int offset = static_cast<int>(-_timezone);
+    if (inDaylightSavingsTime == 1) {
+      static int daylight_bias = GetDaylightSavingBiasInSeconds();
+      // Subtract because windows and Dart disagree on the sign.
+      offset = offset - daylight_bias;
+    }
+    return offset;
+  } else {
+    // Return zero like V8 does.
+    return 0;
   }
-  return offset;
 }
 
 
 int OS::GetLocalTimeZoneAdjustmentInSeconds() {
   // TODO(floitsch): avoid excessive calls to _tzset?
   _tzset();
   // Dart and Windows disagree on the sign of the bias.
   return static_cast<int>(-_timezone);
 }
 
@@ skipping 162 matching lines @@
 void OS::Abort() {
   abort();
 }
 
 
 void OS::Exit(int code) {
   exit(code);
 }
 
 }  // namespace dart