Fix a compiler warning and an after-OOM memory leak.

FossilOrigin-Name: 58f7ca29303c280229f86d01f418e1de5f5aebba

diff --git a/manifest b/manifest
index a3dc17de19afae4d52aa49a6402fc853844b6b39..e6d729925dbb1b79cf7a423e3e9a1313777942d2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\sthe\slatest\schanges\sfrom\strunk.
-D 2014-03-28T18:35:39.779
+C Fix\sa\scompiler\swarning\sand\san\safter-OOM\smemory\sleak.
+D 2014-03-28T19:47:19.372
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -285,7 +285,7 @@ F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 F src/vdbeaux.c 1153175fb57a8454e1c8cf79b59b7bf92b26779d
 F src/vdbeblob.c 15377abfb59251bccedd5a9c7d014a895f0c04aa
 F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
-F src/vdbesort.c 08d5e1ee199599d9571942f0560f84963c7a1a9b
+F src/vdbesort.c ad0f9f717a73b870c12c0a0f47781b8b042a5348
 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@ -1159,7 +1159,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 81987c8ceb64f051528a6ca42673821d9ab7c0ff 27deb6e49bcc76714dbdc61b34748603155ac770
-R 79fcad4572db3d584834fdf0de4170a6
+P 3047a25f1c41e83f0b4772f7c36fbfec0f12dc7e
+R 911f6d7d99d9350a186d106d9b5cf527
 U drh
-Z 871d90dec169e4d494b7ff32475fff97
+Z 55f6b91a865b632e99503eb67df5d777

diff --git a/manifest.uuid b/manifest.uuid
index 518ac58c2af0a42ed9c84347047442474c9fdab3..cf96f017070565b5213d0d8582876e9848a65750 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3047a25f1c41e83f0b4772f7c36fbfec0f12dc7e
\ No newline at end of file
+58f7ca29303c280229f86d01f418e1de5f5aebba
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index f229b1f18b8a3b0e4d480a9413c4286b1a577561..791a2465caf4a8abde87fe57c84537816fc13b66 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -959,7 +959,8 @@ int sqlite3VdbeSorterWrite(
 
       aNew = sqlite3Realloc(pSorter->aMemory, nNew);
       if( !aNew ) return SQLITE_NOMEM;
-      pSorter->pRecord = aNew + ((u8*)pSorter->pRecord - pSorter->aMemory);
+      pSorter->pRecord = (SorterRecord*)
+           (aNew + ((u8*)pSorter->pRecord - pSorter->aMemory));
       pSorter->aMemory = aNew;
       pSorter->nMemory = nNew;
     }
@@ -1052,7 +1053,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
   pSorter->aTree = (int *)&pSorter->aIter[N];
   pSorter->nTree = N;
 
-  do {
+  while(1){
     int iNew;                     /* Index of new, merged, PMA */
 
     for(iNew=0; 
@@ -1105,6 +1106,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
         if( rc==SQLITE_OK ) rc = rc2;
       }
     }
+    if( rc ) break;
 
     if( pSorter->nPMA<=SORTER_MAX_MERGE_COUNT ){
       break;
@@ -1117,7 +1119,7 @@ int sqlite3VdbeSorterRewind(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
       pSorter->iReadOff = 0;
       iWrite2 = 0;
     }
-  }while( rc==SQLITE_OK );
+  }
 
   if( pTemp2 ){
     sqlite3OsCloseFree(pTemp2);