Merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba

[Paul J. Lucas]

Fixed signed integer overflow bug.

Fixed signed integer overflow bug.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1085408-2013-04-16T02-33-43.66Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bug-1085408-2013-04-16T02-33-43.66Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1085408-2013-04-16T06-25-41.622Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1085408-2013-04-16T06-25-41.622Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.

[Nicolae Brinza (nbrinza)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1085408-2013-04-16T13-12-02.236Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1085408-2013-04-16T13-12-02.236Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-04-11 18:13:48 +0000
+++ ChangeLog	2013-04-16 06:08:26 +0000
@@ -43,6 +43,7 @@
   * Fixed bug #1147518 (fn:round-half-to-even (at least 11 failures))
   * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
   * Fixed bug #1124273 (xqdoc crash because of annotation literals)
+  * Fixed bug #1085408 (xs:date(): casting large year values)
   * Fixed bug #867027 (XQST0059 error messages inconsistent)
   * Fixed bug #1095889 (Improve error message for xml-parsing error).
   * Fixed bug #1123163 (fn:format-integer failures)

=== modified file 'src/zorbatypes/datetime/parse.cpp'
--- src/zorbatypes/datetime/parse.cpp	2013-04-05 09:48:19 +0000
+++ src/zorbatypes/datetime/parse.cpp	2013-04-16 06:08:26 +0000
@@ -53,29 +53,37 @@
     long max_digits,
     size_t delta)
 {
-  int tmp_result = 0; // We have to downgrade the precision here from long to int so that some FOTS tests will throw a FOTD0001 date/time overflow. 
-                      // When alternative correct results will be available, this precision downgrading can be removed.
-  long digits = 0;
-
-  if (position + delta >= len)
-    return 1;
-
-  if (str[position+delta] < '0' || str[position+delta] > '9')
-    return 1;
-
-  while ( position + delta < len && ascii::is_digit( str[position+delta] ) )
-  {
-    tmp_result = 10 * tmp_result + str[position + delta] - '0';
-    position++;
-    digits++;
-
-    if (tmp_result < 0) // we've had an overflow
-      return 2;
+  if ( position + delta >= len )
+    return 1;
+
+  //
+  // We have to downgrade the precision here from sizeof(long) to sizeof(int)
+  // so that some FOTS tests will throw a FOTD0001 date/time overflow.  When
+  // alternative correct results are available, this precision downgrading can
+  // be removed.
+  //
+  int tmp_result = 0;
+
+  int digits = 0;
+
+  if ( !ascii::is_digit( str[position+delta] ) )
+    return 1;
+
+  while ( position + delta < len && ascii::is_digit( str[position+delta] ) ) {
+    int const tmp_prev = tmp_result;
+    tmp_result *= 10;
+    // See <http://stackoverflow.com/q/199333/99089>
+    if ( tmp_result / 10 != tmp_prev )
+      return 2;                         // overflow
+    tmp_result += str[position + delta] - '0';
+    if ( tmp_result < tmp_prev )
+      return 2;                         // overflow
+    ++digits;
+    ++position;
   }
 
   if (min_digits >= 0 && digits < min_digits)
     return 1;
-
   if (max_digits >= 0 && digits > max_digits)
     return 1;