Avoid attempting to call the xFetch() method of an sqlite3_io_methods object with...

FossilOrigin-Name: dedaa6fb3d2e6e697d4a48649af5f42d9a11c333

diff --git a/manifest b/manifest
index 7e35806fec324feffcccf89a463efaad610f3a11..bf269d15d055c3698fff566cf7b24f0f43498480 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sEXPENSIVE_ASSERTS\sin\spcache.c\shaving\sto\sdo\swith\sthe\spSynced\sfield\nof\sthe\sPcache\sobject,\sas\sthey\sare\sincorrect,\sas\srevealed\sby\srecent\spcache\nenhancements.
-D 2014-09-15T14:59:12.274
+C Avoid\sattempting\sto\scall\sthe\sxFetch()\smethod\sof\san\ssqlite3_io_methods\sobject\swith\sa\sversion\snumber\sless\sthan\s3.
+D 2014-09-15T16:50:34.423
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -295,7 +295,7 @@ F src/vdbeapi.c 06b712d4772b318b69cd37a416deb1ff0426aa8c
 F src/vdbeaux.c 91fd1e0c54a765838dc61fcf79f31acce035ce38
 F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
 F src/vdbemem.c dc36ea9fe26c25550c50085f388167086ef7d73a
-F src/vdbesort.c ab39574ec6e0c6213bd2a5c09cca9f9f8ba98450
+F src/vdbesort.c a7a40ceca6325b853040ffcc363dcd49a45f201b
 F src/vdbetrace.c 16d39c1ef7d1f4a3a7464bea3b7b4bdd7849c415
 F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
@@ -845,6 +845,7 @@ F test/sort.test 15e1d3014abc3f6d4357ed81b93b82117aefd235
 F test/sort2.test 269f4f50c6e468cc32b302ae7ff0add8338ec6de
 F test/sort3.test 6178ade30810ac9166fcdf14b7065e49c0f534e2
 F test/sort4.test 6c37d85f7cd28d50cce222fcab84ccd771e105cb
+F test/sort5.test a448240a42b49239edc00f85d6d7ac7a1b261e1f
 F test/sortfault.test b8e35177f97438b930ee87c9419ca2599e8073e1
 F test/speed1.test f2974a91d79f58507ada01864c0e323093065452
 F test/speed1p.explain d841e650a04728b39e6740296b852dccdca9b2cb
@@ -1197,7 +1198,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 0bdf1a086b3946722f4d4b328e25917f61c14713
-R 6604c3404d8f943a6eb10e6ee4c1398f
-U drh
-Z 9f457bfb74de1e07b081e001cb58874a
+P 69a64560777f85b47349b4b2aab01dc99298592e
+R 41452df15ff1b435df3a846f31103df4
+U dan
+Z 356b29f991ba0eb562f8fca4ef2b2ea4

diff --git a/manifest.uuid b/manifest.uuid
index 0cb3407f292bae4758e36506e852d57bdc383fd6..13bc35293d5c1e4832fb483a9a44df797e104194 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-69a64560777f85b47349b4b2aab01dc99298592e
\ No newline at end of file
+dedaa6fb3d2e6e697d4a48649af5f42d9a11c333
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index d1ccf6089dc1a4263685c7fa7ca8cda18397a72b..b9a62bf569735e0c195daf0e0615403ac414fd25 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -602,8 +602,11 @@ static int vdbePmaReadVarint(PmaReader *p, u64 *pnOut){
 static int vdbeSorterMapFile(SortSubtask *pTask, SorterFile *pFile, u8 **pp){
   int rc = SQLITE_OK;
   if( pFile->iEof<=(i64)(pTask->pSorter->db->nMaxSorterMmap) ){
-    rc = sqlite3OsFetch(pFile->pFd, 0, (int)pFile->iEof, (void**)pp);
-    testcase( rc!=SQLITE_OK );
+    sqlite3_file *pFd = pFile->pFd;
+    if( pFd->pMethods->iVersion>=3 ){
+      rc = sqlite3OsFetch(pFd, 0, (int)pFile->iEof, (void**)pp);
+      testcase( rc!=SQLITE_OK );
+    }
   }
   return rc;
 }
@@ -1123,7 +1126,7 @@ void sqlite3VdbeSorterClose(sqlite3 *db, VdbeCursor *pCsr){
 static void vdbeSorterExtendFile(sqlite3 *db, sqlite3_file *pFd, i64 nByte){
   if( nByte<=(i64)(db->nMaxSorterMmap) ){
     int rc = sqlite3OsTruncate(pFd, nByte);
-    if( rc==SQLITE_OK ){
+    if( rc==SQLITE_OK && pFd->pMethods->iVersion>=3 ){
       void *p = 0;
       sqlite3OsFetch(pFd, 0, (int)nByte, &p);
       sqlite3OsUnfetch(pFd, 0, p);

diff --git a/test/sort5.test b/test/sort5.test
new file mode 100644 (file)
index 0000000..a02b8f9
--- /dev/null
+++ b/test/sort5.test
@@ -0,0 +1,45 @@
+# 2014 September 15.
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library. 
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix sort5
+
+
+#-------------------------------------------------------------------------
+# Verify that sorting works with a version 1 sqlite3_io_methods structure.
+#
+testvfs tvfs -iversion 1 -default true
+reset_db
+do_execsql_test 1.0 {
+  PRAGMA mmap_size = 10000000;
+  PRAGMA cache_size = 10;
+  CREATE TABLE t1(a, b);
+} {0}
+
+do_test 1.1 {
+  execsql BEGIN
+  for {set i 0} {$i < 2000} {incr i} {
+    execsql { INSERT INTO t1 VALUES($i, randomblob(2000)) }
+  }
+  execsql COMMIT
+} {}
+
+do_execsql_test 1.2 {
+  CREATE INDEX i1 ON t1(b);
+}
+
+db close
+tvfs delete
+finish_test
+