Version 3.8.4.3

FossilOrigin-Name: a611fa96c4a848614efe899130359c9f6fb889c3
Increase the version number to 3.8.4.3
2014-04-03 16:53:12 +00:00 · 2014-04-03 16:18:57 +00:00 · 2014-04-03 16:16:36 +00:00 · 2014-03-26 18:51:19 +00:00 · 2014-03-26 16:25:42 +00:00 · 2014-03-26 16:22:38 +00:00
7 changed files with 57 additions and 29 deletions
@@ -1 +1 @@
-3.8.4.1
+3.8.4.3
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for sqlite 3.8.4.1.
+# Generated by GNU Autoconf 2.62 for sqlite 3.8.4.3.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.8.4.1'
-PACKAGE_STRING='sqlite 3.8.4.1'
+PACKAGE_VERSION='3.8.4.3'
+PACKAGE_STRING='sqlite 3.8.4.3'
 PACKAGE_BUGREPORT=''

 # Factoring default headers for most tests.
@@ -1483,7 +1483,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures sqlite 3.8.4.1 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.8.4.3 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1548,7 +1548,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.8.4.1:";;
+     short | recursive ) echo "Configuration of sqlite 3.8.4.3:";;
   esac
  cat <<\_ACEOF

@@ -1664,7 +1664,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-sqlite configure 3.8.4.1
+sqlite configure 3.8.4.3
 generated by GNU Autoconf 2.62

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1678,7 +1678,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by sqlite $as_me 3.8.4.1, which was
+It was created by sqlite $as_me 3.8.4.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was

  $ $0 $@
@@ -14021,7 +14021,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.8.4.1, which was
+This file was extended by sqlite $as_me 3.8.4.3, which was
 generated by GNU Autoconf 2.62.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -14074,7 +14074,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-sqlite config.status 3.8.4.1
+sqlite config.status 3.8.4.3
 configured by $0, generated by GNU Autoconf 2.62,
  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

@@ -1,12 +1,12 @@
-C Version\s3.8.4.1
-D 2014-03-11T15:27:36.923
+C Version\s3.8.4.3
+D 2014-04-03T16:53:12.416
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
-F VERSION c3b0d47c3c5cf25c5bd4ff9e6f3af2f9d7934ea6
+F VERSION f2e148dd23e570d315c957fee69bd5d302242840
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@@ -38,7 +38,7 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 0921066a13130082764ab4ab6456f7b5bebe56de
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 6a7a482649dd20b7ee31424bf6553c6f20ca7936 x
+F configure 215e976e24f3a008409277800f29dac638b2b3e8 x
 F configure.ac 4cf9f60785143fa141b10962ccc885d973792e9a
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
@@ -282,7 +282,7 @@ F src/vdbe.c 5f0fffa9bf49a90c05dc3d46d8217603fd0ee00e
 F src/vdbe.h fb2c48c198300a7c632f09fc940011d2ad2fc2ae
 F src/vdbeInt.h e54fc4f289fce48e81b3371128446033d097733b
 F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
-F src/vdbeaux.c e45e3f9daf38c5be3fd39e9aacc1c9066af57a06
+F src/vdbeaux.c 714df4e1c82f629d39602fd5a0b6cace9b8832d6
 F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
 F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
@@ -291,7 +291,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c bb50b5aed4f9b2284eb92c944253e60df2fb8259
+F src/where.c 7e56746cb33715baf3c2e78ea6216aaf7229a535
 F src/whereInt.h 921f935af8b684ffb49705610bda7284db1db138
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -405,7 +405,7 @@ F test/corruptE.test 193b4ca4e927e77c1d5f4f56203ddc998432a7ee
 F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
 F test/corruptG.test 58ec333a01997fe655e34e5bea52b7a2a6b9704d
 F test/corruptH.test 88ed71a086e13591c917aac6de32750e7c7281cb
-F test/corruptI.test 88886ec9cd1bdba835263566bbf60ee009c6ea09
+F test/corruptI.test 1b796461e5b635e0a74e3c4ecb1121c82d319dff
 F test/count.test 42a251178e32f617eda33f76236a7f79825a50b5
 F test/coveridxscan.test cdb47d01acc4a634a34fd25abe85189e0d0f1e62
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
@@ -1156,10 +1156,10 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 33f5694fa42d9a521ca081de4ddd1e9dc8952b16
-R 581994aed374f15c1c6bac5b0a9a5df5
+P f05a49b6e006475c5b2678a1195bf67c6f2f07a4
+R d2e6a9f3fa74174124bde3b843da1650
 T +bgcolor * #d0c0ff
 T +sym-release *
-T +sym-version-3.8.4.1 *
+T +sym-version-3.8.4.3 *
 U drh
-Z c1ec45dc8a92b80bfa16f4c74ccfeec8
+Z 9dec8c048dfa23d9d6583a61b396f9d3
@@ -1 +1 @@
-018d317b1257ce68a92908b05c9c7cf1494050d0
+a611fa96c4a848614efe899130359c9f6fb889c3
@@ -3432,6 +3432,7 @@ int sqlite3VdbeRecordCompare(
  }else{
    idx1 = getVarint32(aKey1, szHdr1);
    d1 = szHdr1;
+    if( d1>(unsigned)nKey1 ) return 1;  /* Corruption */
    i = 0;
  }

@@ -5880,7 +5880,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
      for(; k<last; k++, pOp++){
        if( pOp->p1!=pLevel->iTabCur ) continue;
        if( pOp->opcode==OP_Column ){
-          pOp->opcode = OP_SCopy;
+          pOp->opcode = OP_Copy;
          pOp->p1 = pOp->p2 + pTabItem->regResult;
          pOp->p2 = pOp->p3;
          pOp->p3 = 0;
@@ -32,21 +32,48 @@ do_execsql_test 1.1 {
  PRAGMA auto_vacuum=0;
  CREATE TABLE t1(a);
  CREATE INDEX i1 ON t1(a);
-  INSERT INTO t1 VALUES('a');
+  INSERT INTO t1 VALUES('abcdefghijklmnop');
 } {}
 db close

 do_test 1.2 {
  set offset [hexio_get_int [hexio_read test.db [expr 2*1024 + 8] 2]]
  set off [expr 2*1024 + $offset + 1]
-  hexio_write test.db $off FF06
-
-  breakpoint
-
+  hexio_write test.db $off 7f06
  sqlite3 db test.db
  catchsql { SELECT * FROM t1 WHERE a = 10 }
+} {0 {}}
+
+do_test 1.3 {
+  db close
+  set offset [hexio_get_int [hexio_read test.db [expr 2*1024 + 8] 2]]
+  set off [expr 2*1024 + $offset + 1]
+  hexio_write test.db $off FFFF7f02
+  sqlite3 db test.db
+  catchsql { SELECT * FROM t1 WHERE a = 10 }
+} {0 {}}
+
+do_test 2.0 {
+  execsql {
+    CREATE TABLE r(x);
+    INSERT INTO r VALUES('ABCDEFGHIJK');
+    CREATE INDEX r1 ON r(x);
+  }
+  set pg [db one {SELECT rootpage FROM sqlite_master WHERE name = 'r1'}]
+} {5}
+
+do_test 2.1 {
+  db close
+  set offset [hexio_get_int [hexio_read test.db [expr (5-1)*1024 + 8] 2]]
+  set off [expr (5-1)*1024 + $offset + 1]
+  hexio_write test.db $off FFFF0004
+  sqlite3 db test.db
+  catchsql { SELECT * FROM r WHERE x >= 10.0 }
+} {1 {database disk image is malformed}}
+
+do_test 2.2 {
+  catchsql { SELECT * FROM r WHERE x >= 10 }
 } {1 {database disk image is malformed}}


 finish_test
-
Author	SHA1	Message	Date
drh	f89d6eeb9d	Version 3.8.4.3 FossilOrigin-Name: a611fa96c4a848614efe899130359c9f6fb889c3	2014-04-03 16:53:12 +00:00
drh	b2b67f64a8	Increase the version number to 3.8.4.3 FossilOrigin-Name: f05a49b6e006475c5b2678a1195bf67c6f2f07a4	2014-04-03 16:18:57 +00:00
drh	ee6a4d62de	Use OP_Copy instead of OP_SCopy when moving results out of a subquery, to prevent the subquery results from changing out from under the outer query. Fix for ticket [1e64dd782a126f48d78]. FossilOrigin-Name: ec6a06246e04eee5f25f1c28507df73b697099c0	2014-04-03 16:16:36 +00:00
drh	464c5efaca	Version 3.8.4.2 FossilOrigin-Name: 02ea166372bdb2ef9d8dfbb05e78a97609673a8e	2014-03-26 18:51:19 +00:00
drh	dc49fe78cb	Increase the version number to 3.8.4.2. FossilOrigin-Name: 59978a2e425e6f53853a4ad9dc9c7229476091fa	2014-03-26 16:25:42 +00:00
drh	cefb6ce162	Fix a potential buffer overread that could have occurred when searching a corrupt database file. FossilOrigin-Name: db2935473eab91cde3c01353ae29e112ab0c7acb	2014-03-26 16:22:38 +00:00
@@ -1 +1 @@
 .8.4.1
 .8.4.3