ICU-64252.0.1.tar.gz

[apple/icu.git] / icuSources / i18n / simpletz.cpp

diff --git a/icuSources/i18n/simpletz.cpp b/icuSources/i18n/simpletz.cpp
index dc8defabcecd663d42604a7cc4269cb0977f498f..9321fda3447d1835e5d6e94cb1eaba18ef569210 100644 (file)
--- a/icuSources/i18n/simpletz.cpp
+++ b/icuSources/i18n/simpletz.cpp
@@ -1,3 +1,5 @@
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html

 /*
  *******************************************************************************
  * Copyright (C) 1997-2013, International Business Machines Corporation and
 /*
  *******************************************************************************
  * Copyright (C) 1997-2013, International Business Machines Corporation and


@@ -31,6 +33,7 @@
 #include "unicode/gregocal.h"
 #include "unicode/smpdtfmt.h"
 
 #include "unicode/gregocal.h"
 #include "unicode/smpdtfmt.h"
 

+#include "cmemory.h"

 #include "gregoimp.h"
 #include "umutex.h"
 
 #include "gregoimp.h"
 #include "umutex.h"
 


@@ -175,7 +178,7 @@ void SimpleTimeZone::construct(int32_t rawOffsetGMT,
 
     decodeRules(status);
 
 
     decodeRules(status);
 

-    if (savingsDST <= 0) {
+    if (savingsDST == 0) {

         status = U_ILLEGAL_ARGUMENT_ERROR;
     }
 }
         status = U_ILLEGAL_ARGUMENT_ERROR;
     }
 }


@@ -684,7 +687,7 @@ SimpleTimeZone::setRawOffset(int32_t offsetMillis)
 void 
 SimpleTimeZone::setDSTSavings(int32_t millisSavedDuringDST, UErrorCode& status) 
 {
 void 
 SimpleTimeZone::setDSTSavings(int32_t millisSavedDuringDST, UErrorCode& status) 
 {

-    if (millisSavedDuringDST <= 0) {
+    if (millisSavedDuringDST == 0) {

         status = U_ILLEGAL_ARGUMENT_ERROR;
     }
     else {
         status = U_ILLEGAL_ARGUMENT_ERROR;
     }
     else {


@@ -1075,19 +1078,19 @@ SimpleTimeZone::deleteTransitionRules(void) {
  *         allocate it in the constructors. This would be a more intrusive change, but doable
  *         if performance turns out to be an issue.
  */
  *         allocate it in the constructors. This would be a more intrusive change, but doable
  *         if performance turns out to be an issue.
  */

-static UMutex gLock = U_MUTEX_INITIALIZER;

 
 void
 SimpleTimeZone::checkTransitionRules(UErrorCode& status) const {
     if (U_FAILURE(status)) {
         return;
     }
 
 void
 SimpleTimeZone::checkTransitionRules(UErrorCode& status) const {
     if (U_FAILURE(status)) {
         return;
     }

-    umtx_lock(&gLock);
+    static UMutex *gLock = STATIC_NEW(UMutex);
+    umtx_lock(gLock);

     if (!transitionRulesInitialized) {
         SimpleTimeZone *ncThis = const_cast<SimpleTimeZone*>(this);
         ncThis->initTransitionRules(status);
     }
     if (!transitionRulesInitialized) {
         SimpleTimeZone *ncThis = const_cast<SimpleTimeZone*>(this);
         ncThis->initTransitionRules(status);
     }

-    umtx_unlock(&gLock);
+    umtx_unlock(gLock);

 }
 
 void
 }
 
 void


@@ -1187,13 +1190,22 @@ SimpleTimeZone::initTransitionRules(UErrorCode& status) {
         // Create a TimeZoneRule for initial time
         if (firstStdStart < firstDstStart) {
             initialRule = new InitialTimeZoneRule(tzid+UnicodeString(DST_STR), getRawOffset(), dstRule->getDSTSavings());
         // Create a TimeZoneRule for initial time
         if (firstStdStart < firstDstStart) {
             initialRule = new InitialTimeZoneRule(tzid+UnicodeString(DST_STR), getRawOffset(), dstRule->getDSTSavings());

+            if (initialRule == NULL) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                deleteTransitionRules();
+                return;
+            }

             firstTransition = new TimeZoneTransition(firstStdStart, *initialRule, *stdRule);
         } else {
             initialRule = new InitialTimeZoneRule(tzid+UnicodeString(STD_STR), getRawOffset(), 0);
             firstTransition = new TimeZoneTransition(firstStdStart, *initialRule, *stdRule);
         } else {
             initialRule = new InitialTimeZoneRule(tzid+UnicodeString(STD_STR), getRawOffset(), 0);

+            if (initialRule == NULL) {
+                status = U_MEMORY_ALLOCATION_ERROR;
+                deleteTransitionRules();
+                return;
+            }

             firstTransition = new TimeZoneTransition(firstDstStart, *initialRule, *dstRule);
         }
             firstTransition = new TimeZoneTransition(firstDstStart, *initialRule, *dstRule);
         }

-        // Check for null pointers.
-        if (initialRule == NULL || firstTransition == NULL) {
+        if (firstTransition == NULL) {

             status = U_MEMORY_ALLOCATION_ERROR;
             deleteTransitionRules();
             return;
             status = U_MEMORY_ALLOCATION_ERROR;
             deleteTransitionRules();
             return;