Changeset 647 for XIOS/trunk

Timestamp:

07/20/15 11:52:26 (9 years ago)

Author:

rlacroix

Message:

Fix a possible overflow when converting a date in seconds since the time origin.

File:

• XIOS/trunk/src/date.cpp (modified) (1 diff)

XIOS/trunk/src/date.cpp

@@ -103 +103 @@
 
         // Todo : Tester si la date courante est supérieure à la date initiale.
-        Time retvalue = getSecondOfYear() - c.getTimeOrigin().getSecondOfYear();
+        Time t = getSecondOfYear() - c.getTimeOrigin().getSecondOfYear();
 
         if (c.hasLeapYear())
         {
-          for (CDate _d(c.getTimeOrigin()); _d.getYear() < getYear(); _d.setYear(_d.getYear() + 1))
-            retvalue += c.getYearTotalLength(_d);
+          for (CDate d(c.getTimeOrigin()); d.getYear() < getYear(); d.setYear(d.getYear() + 1))
+            t += c.getYearTotalLength(d);
         }
         else
-          retvalue += (getYear() - c.getTimeOrigin().getYear()) * c.getYearTotalLength(*this);
-
-
-        return retvalue;
+          t += Time(getYear() - c.getTimeOrigin().getYear()) * c.getYearTotalLength(*this);
+
+        return t;
       }