Index: src/vdbesort.c
==================================================================
--- src/vdbesort.c
+++ src/vdbesort.c
@@ -957,11 +957,12 @@
       if( nNew > pSorter->mxPmaSize ) nNew = pSorter->mxPmaSize;
       if( nNew < nMin ) nNew = nMin;
 
       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;
     }
 
     pNew = (SorterRecord*)&pSorter->aMemory[pSorter->iMemory];
@@ -1050,11 +1051,11 @@
   pSorter->aIter = (VdbeSorterIter *)sqlite3DbMallocZero(db, nByte);
   if( !pSorter->aIter ) return SQLITE_NOMEM;
   pSorter->aTree = (int *)&pSorter->aIter[N];
   pSorter->nTree = N;
 
-  do {
+  while(1){
     int iNew;                     /* Index of new, merged, PMA */
 
     for(iNew=0; 
         rc==SQLITE_OK && iNew*SORTER_MAX_MERGE_COUNT<pSorter->nPMA; 
         iNew++
@@ -1103,10 +1104,11 @@
         }
         rc2 = fileWriterFinish(db, &writer, &iWrite2);
         if( rc==SQLITE_OK ) rc = rc2;
       }
     }
+    if( rc ) break;
 
     if( pSorter->nPMA<=SORTER_MAX_MERGE_COUNT ){
       break;
     }else{
       sqlite3_file *pTmp = pSorter->pTemp1;
@@ -1115,11 +1117,11 @@
       pTemp2 = pTmp;
       pSorter->iWriteOff = iWrite2;
       pSorter->iReadOff = 0;
       iWrite2 = 0;
     }
-  }while( rc==SQLITE_OK );
+  }
 
   if( pTemp2 ){
     sqlite3OsCloseFree(pTemp2);
   }
   *pbEof = (pSorter->aIter[pSorter->aTree[1]].pFile==0);