Fix a faulty assert() statement.

FossilOrigin-Name: 9196ce407379ca3b151b601b98848771e5cb4e8f

diff --git a/manifest b/manifest
index 6166275bb9045cf92ee0f77ea4448a3b2c78f98b..789773a941cd1f7b7d32fde6ccdde5e52982e778 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\senhancements\sand\sfixes\sinto\sthe\sorderby-planning\sbranch.
-D 2014-05-02T13:09:06.754
+C Fix\sa\sfaulty\sassert()\sstatement.
+D 2014-05-02T15:25:24.157
 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 469ae9af4115779b527b47edd53bd9a0943f7906
+F src/vdbesort.c d0fc5ecd19650b335e58632e60c9b8585b839c65
 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 bf09ce24d054bc68c226064f5f28d97e0e648a13 3bc43594aaeee9225c0590677fcce480bedcb37b
-R 54b60e57b7c4903b7427b2471b549ff9
+P 84862d3a095629d20c8e7b8a16f4dc26cd41ab6d
+R f6e2655ab9521eb2aa3af53a52824666
 U drh
-Z 3f220c7986d95ea2653ad2dab9b5d42e
+Z 7c7e4b02db28ce1795a4d7aa65a0e17d

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

diff --git a/src/vdbesort.c b/src/vdbesort.c
index 6a34cefa618f536c5d8a7331e4a63e830631188d..70fbbcf42520d3c0a28704e90376b9eeab95eea1 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -733,10 +733,10 @@ static int vdbeSorterSort(const VdbeCursor *pCsr){
   while( p ){
     SorterRecord *pNext;
     if( pSorter->aMemory ){
-      assert( p->u.iNext<pSorter->nMemory );
       if( (u8*)p==pSorter->aMemory ){
         pNext = 0;
       }else{
+        assert( p->u.iNext<pSorter->nMemory );
         pNext = (SorterRecord*)&pSorter->aMemory[p->u.iNext];
       }
     }else{