SERVER-13760 Do not call dateToISOString if date is not formatable

6 files changed, 55 insertions, 8 deletions

diff --git a/src/mongo/db/jsobj.cpp b/src/mongo/db/jsobj.cpp
index ee7b929ec4e..716e9456769 100644
--- a/src/mongo/db/jsobj.cpp
+++ b/src/mongo/db/jsobj.cpp
@@ -223,11 +223,17 @@ namespace mongo {
             if (format == Strict) {
                 Date_t d = date();
                 s << "{ \"$date\" : ";
-                if (static_cast<long long>(d.millis) < 0) {
-                    s << "{ \"$numberLong\" : \"" << static_cast<long long>(d.millis) << "\" }";
+                // The two cases in which we cannot convert Date_t::millis to an ISO Date string are
+                // when the date is too large to format (SERVER-13760), and when the date is before
+                // the epoch (SERVER-11273).  Since Date_t internally stores millis as an unsigned
+                // long long, despite the fact that it is logically signed (SERVER-8573), this check
+                // handles both the case where Date_t::millis is too large, and the case where
+                // Date_t::millis is negative (before the epoch).
+                if (d.isFormatable()) {
+                    s << "\"" << dateToISOStringLocal(date()) << "\"";
                 }
                 else {
-                    s << "\"" << dateToISOStringLocal(date()) << "\"";
+                    s << "{ \"$numberLong\" : \"" << static_cast<long long>(d.millis) << "\" }";
                 }
                 s << " }";
             }
@@ -235,14 +241,20 @@ namespace mongo {
                 s << "Date( ";
                 if (pretty) {
                     Date_t d = date();
-                    if (static_cast<long long>(d.millis) < 0) {
+                    // The two cases in which we cannot convert Date_t::millis to an ISO Date string
+                    // are when the date is too large to format (SERVER-13760), and when the date is
+                    // before the epoch (SERVER-11273).  Since Date_t internally stores millis as an
+                    // unsigned long long, despite the fact that it is logically signed
+                    // (SERVER-8573), this check handles both the case where Date_t::millis is too
+                    // large, and the case where Date_t::millis is negative (before the epoch).
+                    if (d.isFormatable()) {
+                        s << "\"" << dateToISOStringLocal(date()) << "\"";
+                    }
+                    else {
                         // FIXME: This is not parseable by the shell, since it may not fit in a
                         // float
                         s << d.millis;
                     }
-                    else {
-                        s << "\"" << dateToISOStringLocal(date()) << "\"";
-                    }
                 }
                 else {
                     s << date().asInt64();
diff --git a/src/mongo/dbtests/jsontests.cpp b/src/mongo/dbtests/jsontests.cpp
index c5d63739207..a8e17ca4ba5 100644
--- a/src/mongo/dbtests/jsontests.cpp
+++ b/src/mongo/dbtests/jsontests.cpp
@@ -418,6 +418,14 @@ namespace JsonTests {
                                built.jsonString( Strict ) );
                 ASSERT_EQUALS( "{ \"a\" : Date( 0 ) }", built.jsonString( TenGen ) );
                 ASSERT_EQUALS( "{ \"a\" : Date( 0 ) }", built.jsonString( JS ) );
+
+                // Test dates above our maximum formattable date.  See SERVER-13760.
+                BSONObjBuilder b2;
+                b2.appendDate("a", 32535262800000ULL);
+                BSONObj built2 = b2.done();
+                ASSERT_EQUALS(
+                            "{ \"a\" : { \"$date\" : { \"$numberLong\" : \"32535262800000\" } } }",
+                            built2.jsonString( Strict ) );
             }
 
         private:
diff --git a/src/mongo/tools/export.cpp b/src/mongo/tools/export.cpp
index 5e9bca22432..75460f76a15 100644
--- a/src/mongo/tools/export.cpp
+++ b/src/mongo/tools/export.cpp
@@ -92,7 +92,10 @@ public:
         case jstOID:
             return "ObjectID(" + object.OID().toString() + ")"; // OIDs are always 24 bytes
         case Date:
-            return dateToISOStringUTC(object.Date());
+            // We need to check if we can actually format this date.  See SERVER-13760.
+            return object.Date().isFormatable() ?
+                        dateToISOStringUTC(object.Date()) :
+                        csvEscape(object.jsonString(Strict, false));
         case Timestamp:
             return csvEscape(object.jsonString(Strict, false));
         case RegEx:
diff --git a/src/mongo/util/time_support.cpp b/src/mongo/util/time_support.cpp
index 6dbe2d19fc8..a950e082417 100644
--- a/src/mongo/util/time_support.cpp
+++ b/src/mongo/util/time_support.cpp
@@ -61,6 +61,15 @@ timegm(struct tm *const tmp);
 
 namespace mongo {
 
+    bool Date_t::isFormatable() const {
+        if (sizeof(time_t) == sizeof(int32_t)) {
+            return millis < 2147483647000ULL; // "2038-01-19T03:14:07Z"
+        }
+        else {
+            return millis < 32535215999000ULL; // "3000-12-31T23:59:59Z"
+        }
+    }
+
     // jsTime_virtual_skew is just for testing. a test command manipulates it.
     long long jsTime_virtual_skew = 0;
     boost::thread_specific_ptr<long long> jsTime_virtual_thread_skew;
@@ -137,6 +146,7 @@ namespace {
     };
 
     void _dateToISOString(Date_t date, bool local, DateStringBuffer* result) {
+        invariant(date.isFormatable());
         static const int bufSize = DateStringBuffer::dataCapacity;
         char* const buf = result->data;
         struct tm t;
diff --git a/src/mongo/util/time_support.h b/src/mongo/util/time_support.h
index 284aa7a811e..92288138fbb 100644
--- a/src/mongo/util/time_support.h
+++ b/src/mongo/util/time_support.h
@@ -57,6 +57,7 @@ namespace mongo {
         int64_t asInt64() const {
             return static_cast<int64_t>(millis);
         }
+        bool isFormatable() const;
     };
 
     // uses ISO 8601 dates without trailing Z
diff --git a/src/mongo/util/time_support_test.cpp b/src/mongo/util/time_support_test.cpp
index 39d2a28980e..1709295dcbd 100644
--- a/src/mongo/util/time_support_test.cpp
+++ b/src/mongo/util/time_support_test.cpp
@@ -180,6 +180,10 @@ namespace {
             swull = dateFromISOString("2058-02-20T18:29:11.100Z");
             ASSERT_OK(swull.getStatus());
             ASSERT_EQUALS(swull.getValue(), 2781455351100ULL);
+
+            swull = dateFromISOString("3001-01-01T08:00:00.000Z");
+            ASSERT_OK(swull.getStatus());
+            ASSERT_EQUALS(swull.getValue(), 32535244800000ULL);
         }
 
         swull = dateFromISOString("2013-02-20T18:29:11.100Z");
@@ -250,6 +254,15 @@ namespace {
             swull = dateFromISOString("2058-02-20T13:29:11.100-0500");
             ASSERT_OK(swull.getStatus());
             ASSERT_EQUALS(swull.getValue(), 2781455351100ULL);
+
+            swull = dateFromISOString("3000-12-31T23:59:59Z");
+            ASSERT_OK(swull.getStatus());
+            ASSERT_EQUALS(swull.getValue(), 32535215999000ULL);
+        }
+        else {
+            swull = dateFromISOString("2038-01-19T03:14:07Z");
+            ASSERT_OK(swull.getStatus());
+            ASSERT_EQUALS(swull.getValue(), 2147483647000ULL);
         }
 
         swull = dateFromISOString("2013-02-20T13:29:11.100-0500");