From 208cac197e0b80aa77c0ecf0462d2e48457bb564 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Fri, 2 Dec 2016 14:15:13 +0000
Subject: [PATCH] Fix a potential integer overflow during out-of-bound date
 computations.

FossilOrigin-Name: 3c58b173d90f2fbf7a1de7eb0177a0a10abe14fa
---
 manifest       | 17 ++++++++++-------
 manifest.uuid  |  2 +-
 src/date.c     |  8 +++++++-
 test/date.test |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/manifest b/manifest
index 7adba24c89..9ccfe0b834 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Test\scases\sfor\sthe\simproved\sLIKE/GLOB\smatcher.
-D 2016-12-02T02:19:24.505
+C Fix\sa\spotential\sinteger\soverflow\sduring\sout-of-bound\sdate\scomputations.
+D 2016-12-02T14:15:13.677
 F Makefile.in 7639c6a09da11a9c7c6f2630fc981ee588d1072d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -338,7 +338,7 @@ F src/build.c 178f16698cbcb43402c343a9413fe22c99ffee21
 F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c a2a52d6e353f459d8ab0f07321f60fafa47d5421
-F src/date.c 206d0eb85cedec99a9820929579057fb364a72cb
+F src/date.c 59fc29b41e89f1a275a542f7b49044a29db29f93
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c cac97d1117a3008934da3a6a587b3608e65e1495
 F src/expr.c b22e09630f874c52db0770973b7ce55ee50c1dde
@@ -627,7 +627,7 @@ F test/csv01.test e0ba3caaa57e4c667a0b45977689fb8082f14348
 F test/ctime.test ff6c38e822459d6ca743c34901caf57740b08b54
 F test/cursorhint.test 7bc346788390475e77a345da2b92270d04d35856
 F test/cursorhint2.test fa41f0d997e67db921d08c31e73111b32811201a
-F test/date.test a6a5a48b90907bca9fbcc79a30be5a715c1ab2fc
+F test/date.test d8641ed74f7124f936cd9fe2655a5027ede44555
 F test/dbstatus.test 73149851b3aff14fc6db478e58f9083a66422cf5
 F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab
 F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d
@@ -1536,7 +1536,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a427c4052820d90c3c8c23abf9097f973e564010
-R f16f032d9f385e340b291882ba284c15
+P 0bdb7ae126d3909344640813489ee68ecad041c4
+R ff3d4ba789c8d69735c8c8119c5c2780
+T *branch * date-overflow-fix
+T *sym-date-overflow-fix *
+T -sym-trunk *
 U drh
-Z a0288af86999fbddd2602cee91996f35
+Z 65b591541b07a1d748633b859b928818
diff --git a/manifest.uuid b/manifest.uuid
index 9002e90b71..70454bf54b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0bdb7ae126d3909344640813489ee68ecad041c4
\ No newline at end of file
+3c58b173d90f2fbf7a1de7eb0177a0a10abe14fa
\ No newline at end of file
diff --git a/src/date.c b/src/date.c
index c675d17455..1973370280 100644
--- a/src/date.c
+++ b/src/date.c
@@ -841,7 +841,13 @@ static int isDate(
   }
   for(i=1; i<argc; i++){
     z = sqlite3_value_text(argv[i]);
-    if( z==0 || parseModifier(context, (char*)z, p) ) return 1;
+    if( z==0 ) return 1;
+    if( p->validJD && !validJulianDay(p->iJD) 
+     && strcmp((const char*)z,"unixepoch")!=0
+    ){
+      return 1;
+    }
+    if( parseModifier(context, (char*)z, p) ) return 1;
   }
   computeJD(p);
   if( p->isError || !validJulianDay(p->iJD) ) return 1;
diff --git a/test/date.test b/test/date.test
index 2d336e6c00..288e1bfcab 100644
--- a/test/date.test
+++ b/test/date.test
@@ -595,6 +595,6 @@ datetest 16.28 {datetime(5373484,'-176545 months')} {-4713-12-01 12:00:00}
 datetest 16.29 {datetime(5373484,'-176546 months')} NULL
 datetest 16.30 {datetime(5373484,'-14712 years')} {-4713-12-31 12:00:00}
 datetest 16.31 {datetime(5373484,'-14713 years')} NULL
-
+datetest 16.32 {datetime('-5e19','-01:00')} NULL
 
 finish_test
-- 
2.39.5