Make sure the OP_ForceInt vdbe opcode does not cause a rowid overflow.

Ticket #3536.  Tests to verify this change will be checked in separately. (CVS 6022)

FossilOrigin-Name: 6a049c6595550c123e77199cf7f3898bfcf40c86

diff --git a/manifest b/manifest
index 4092193d1759c252b0370c8e3305914c13b1841d..1d28cf9cc4b55cee0993472d9610c1df71eded9f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Guard\sagainst\sattacks\sfrom\sdeliberately\scorrupted\sdatabase\sfiles.\s(CVS\s6021)
-D 2008-12-11T16:17:04
+C Make\ssure\sthe\sOP_ForceInt\svdbe\sopcode\sdoes\snot\scause\sa\srowid\soverflow.\nTicket\s#3536.\s\sTests\sto\sverify\sthis\schange\swill\sbe\schecked\sin\sseparately.\s(CVS\s6022)
+D 2008-12-11T19:50:19
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in f7e4c81c347b04f7b0f1c1b081a168645d7b8af7
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -194,7 +194,7 @@ F src/update.c 080889d241e4dcd1c545c8051eb6de86f4939295
 F src/utf.c 1da9c832dba0fa8f865b5b902d93f420a1ee4245
 F src/util.c ea62608f66f33a7e8322de83024ae37c415c0c7f
 F src/vacuum.c 383d6297bddc011ab04a9eed110db6eaf523e8e9
-F src/vdbe.c 46eed1fc5f24500d551c6aac960f812c6145dcee
+F src/vdbe.c 78e24995434444af5e70954bc2a3c11b7df8ce09
 F src/vdbe.h 03516f28bf5aca00a53c4dccd6c313f96adb94f6
 F src/vdbeInt.h e6e80a99ce634983b7cc2498843b4d2e5540900a
 F src/vdbeapi.c 85c33cfbfa56249cbe627831610afafba754477d
@@ -664,7 +664,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 7c367515f86c36b7ec8603754b20f1c7c4a0690a
-R 444a7244e9f7d54c88f06e95ece4e75e
+P da2ec96422b1f9de2e47d3b8c19ed20579742a9b
+R c7952d9cca38bcb28b7004a2d09f78ae
 U drh
-Z 5d08690a9b2d2b8626ebdbffda6c718a
+Z e33e580283d52f7544ecf69dc34e2327

diff --git a/manifest.uuid b/manifest.uuid
index 9fed416c22a1491208bc80273e5a6c54a0ddcf1b..c7b6b314506c8a1edc759a4bd6548abda59ef39f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-da2ec96422b1f9de2e47d3b8c19ed20579742a9b
\ No newline at end of file
+6a049c6595550c123e77199cf7f3898bfcf40c86
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index b806ec34c6e3cbea05656184389702ef56f6196b..738f1170542a5f1aadb25b7d1fe466655b0a330b 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.799 2008/12/11 16:17:04 drh Exp $
+** $Id: vdbe.c,v 1.800 2008/12/11 19:50:19 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1441,26 +1441,41 @@ case OP_AddImm: {            /* in1 */
 **
 ** Convert value in register P1 into an integer.  If the value 
 ** in P1 is not numeric (meaning that is is a NULL or a string that
-** does not look like an integer or floating point number) then
-** jump to P2.  If the value in P1 is numeric then
-** convert it into the least integer that is greater than or equal to its
-** current value if P3==0, or to the least integer that is strictly
-** greater than its current value if P3==1.
+** does not look like an integer) then jump to P2.
+**
+** If the value in P1 is numeric then convert it into the smallest
+** integer that is greater than or equal to its current value if P3==0, 
+** or to the smallest integer that is strictly greater than its current
+** value if P3==1.
+**
+** If the conversion described in the previous paragraph causes the
+** value to exceed the largest possible integer value 
+** (9223372036854775807), then jump to P2.
 */
 case OP_ForceInt: {            /* jump, in1 */
-  i64 v;
+  i64 v;                       /* The value to store in P1 */
+  int incrV = 0;               /* True to cause v to increment */
   applyAffinity(pIn1, SQLITE_AFF_NUMERIC, encoding);
   if( (pIn1->flags & (MEM_Int|MEM_Real))==0 ){
     pc = pOp->p2 - 1;
     break;
   }
+  incrV = pOp->p3 ?1:0;
   if( pIn1->flags & MEM_Int ){
-    v = pIn1->u.i + (pOp->p3!=0);
+    v = pIn1->u.i;
   }else{
     assert( pIn1->flags & MEM_Real );
     v = (sqlite3_int64)pIn1->r;
-    if( pIn1->r>(double)v ) v++;
-    if( pOp->p3 && pIn1->r==(double)v ) v++;
+    if( pIn1->r>(double)v ){
+      incrV = 1;
+    }
+  }
+  if( incrV ){
+    if( v==LARGEST_INT64 ){
+      pc = pOp->p2 - 1;
+      break;
+    }
+    v++;
   }
   pIn1->u.i = v;
   MemSetTypeFlag(pIn1, MEM_Int);