Failure to extend a temp file for use with mmap() in vdbesort.c is benign.

FossilOrigin-Name: d4d396387d373bd1e82eda2c7c2e7ca35ec099c4

diff --git a/manifest b/manifest
index 789773a941cd1f7b7d32fde6ccdde5e52982e778..d6c9c71387b83d8cce3b79fc70181d702322f07b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sfaulty\sassert()\sstatement.
-D 2014-05-02T15:25:24.157
+C Failure\sto\sextend\sa\stemp\sfile\sfor\suse\swith\smmap()\sin\svdbesort.c\sis\sbenign.
+D 2014-05-02T16:22:55.791
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -286,7 +286,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c d0fc5ecd19650b335e58632e60c9b8585b839c65
+F src/vdbesort.c 6bcf73fb160ee5bb8ce8a8ec61fda268b081dbb7
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1166,7 +1166,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 84862d3a095629d20c8e7b8a16f4dc26cd41ab6d
-R f6e2655ab9521eb2aa3af53a52824666
+P 9196ce407379ca3b151b601b98848771e5cb4e8f
+R 51e21c516ddbd5830d43ea54f991a56e
 U drh
-Z 7c7e4b02db28ce1795a4d7aa65a0e17d
+Z 19bdd7c6b9f54ab4b2fbcff19d13a623

diff --git a/manifest.uuid b/manifest.uuid
index a5c49533a7010e501acb9bf96aff2fe6ead3cb8a..e8d80914a0f28d76f214460ab9d5c18227826039 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9196ce407379ca3b151b601b98848771e5cb4e8f
\ No newline at end of file
+d4d396387d373bd1e82eda2c7c2e7ca35ec099c4
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 70fbbcf42520d3c0a28704e90376b9eeab95eea1..86fef69256ca01743687380b59fe4dbe81d8ed7f 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -857,17 +857,16 @@ static void fileWriterWriteVarint(FileWriter *p, u64 iVal){
 ** Whether or not the file does end up memory mapped of course depends on 
 ** the specific VFS implementation.
 */
-static int vdbeSorterExtendFile(sqlite3_file *pFile, i64 nByte){
+static void vdbeSorterExtendFile(sqlite3_file *pFile, i64 nByte){
   int rc = sqlite3OsTruncate(pFile, nByte);
   if( rc==SQLITE_OK ){
     void *p = 0;
     sqlite3OsFetch(pFile, 0, nByte, &p);
     sqlite3OsUnfetch(pFile, 0, p);
   }
-  return rc;
 }
 #else
-# define vdbeSorterExtendFile(x,y) SQLITE_OK
+# define vdbeSorterExtendFile(x,y)
 #endif
 
 /*
@@ -907,8 +906,8 @@ static int vdbeSorterListToPMA(sqlite3 *db, const VdbeCursor *pCsr){
 
   /* Try to get the file to memory map */
   if( rc==SQLITE_OK ){
-    rc = vdbeSorterExtendFile(
-        pSorter->pTemp1, pSorter->iWriteOff + pSorter->nInMemory + 9
+    vdbeSorterExtendFile(
+      pSorter->pTemp1, pSorter->iWriteOff + pSorter->nInMemory + 9
     );
   }
 
@@ -1132,7 +1131,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
         assert( iWrite2==0 );
         rc = vdbeSorterOpenTempFile(db, &pTemp2);
         if( rc==SQLITE_OK ){
-          rc = vdbeSorterExtendFile(pTemp2, pSorter->iWriteOff);
+          vdbeSorterExtendFile(pTemp2, pSorter->iWriteOff);
         }
       }