Add an assert() in order to calm a scan-build warning.

FossilOrigin-Name: 11e81ac2a7c917f7c9afc218d104d9870daf9668

diff --git a/manifest b/manifest
index 3ecf678cb94b5c50476af6618b8152181111207d..18464b0405877937ef73af686bd8ffb1dd02316e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sdetection\sof\sthe\sisnan()\slibrary\sfunction\sto\sthe\sconfigure\sscript.\s\sMake\nthe\scode\sresponsive\sto\sthe\sHAVE_ISNAN\sconfiguration\soption.
-D 2015-01-10T18:22:06.081
+C Add\san\sassert()\sin\sorder\sto\scalm\sa\sscan-build\swarning.
+D 2015-01-12T17:56:06.382
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 876093578650b28af50a20c819993ee779885adb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -298,7 +298,7 @@ F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a
 F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
-F src/vdbesort.c 560bdfd9eb3ae3205196e0d64ccd1de925caa6c7
+F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
 F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
@@ -1235,7 +1235,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 694228e4632c2999efa47ecb49f679c177db02e5
-R 332805e27e3ffd90d9186edc59ab2f6e
+P 46f3aba2692d74c29ab5c1f24a6daac600fd6af8
+R 92ea1bf6542c9d9c7faa1f3f4f13619f
 U drh
-Z 73760a179fa08b38d3fe890bfb333a58
+Z e7423f8002cbebe040ecb69ba833d201

diff --git a/manifest.uuid b/manifest.uuid
index c03ed434744099ce323da5b64098048c26d38037..37e56a13ff0886aa8eac10cc0bc15e05f8467384 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-46f3aba2692d74c29ab5c1f24a6daac600fd6af8
\ No newline at end of file
+11e81ac2a7c917f7c9afc218d104d9870daf9668
\ No newline at end of file

diff --git a/src/vdbesort.c b/src/vdbesort.c
index d76487d4916eea21a81eb683b1799b8c48d661d5..5a43a10542b3499f26c77c058cafaef16ab0648f 100644 (file)
--- a/src/vdbesort.c
+++ b/src/vdbesort.c
@@ -2414,6 +2414,7 @@ int sqlite3VdbeSorterNext(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
     }else
 #endif
     /*if( !pSorter->bUseThreads )*/ {
+      assert( pSorter->pMerger!=0 );
       assert( pSorter->pMerger->pTask==(&pSorter->aTask[0]) );
       rc = vdbeMergeEngineStep(pSorter->pMerger, pbEof);
     }