Add an assert() to the btree rebalancer in order to silence a

clang/scan-build warning.

FossilOrigin-Name: 6730579cf5c6c74cb293e7237d896d3a3a36b691

diff --git a/manifest b/manifest
index 42bcaa0a497ea87c4a1d4d8bba2741ed4550ade4..61ec3496c37ded11deb8b8ccc4e4e907e20a7b04 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sspellfix\svirtual\stable\sto\sthe\slatest\sdevelopment\scode.
-D 2012-08-14T17:29:27.517
+C Add\san\sassert()\sto\sthe\sbtree\srebalancer\sin\sorder\sto\ssilence\sa\s\nclang/scan-build\swarning.
+D 2012-08-14T18:43:39.547
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in abd5c10d21d1395f140d9e50ea999df8fa4d6376
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -123,7 +123,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 5b31b24d6814b11de763debf342c8cd0a15a4910
 F src/bitvec.c 26675fe8e431dc555e6f2d0e11e651d172234aa1
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c fe84910555e103013455e21571ac8bbed23c5c50
+F src/btree.c 82b6fcbec3101ff951f47797f407d5eb5d06fa44
 F src/btree.h 4aee02e879211bfcfd3f551769578d2e940ab6c2
 F src/btreeInt.h 4e5c2bd0f9b36b2a815a6d84f771a61a65830621
 F src/build.c 0f6b40ad6211dcaba6159d0f9a297f0704f22142
@@ -1010,7 +1010,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 1de2237d005fa1a1e1d034820d17daf64a860f81
-R c6a6a5e27cc06765fbb21bed044152b3
+P 6954fef006431d153de6e63e362b8d260ebeb1c6
+R c7501b04ad663e9c70817cec3b4cff7e
 U drh
-Z f62627106b46abb8dea1d772e4525d54
+Z aedea036152f85450c01ebb017cff317

diff --git a/manifest.uuid b/manifest.uuid
index a2aa6fb25c63d7bfae29e6b121fb05e344c2e1cc..a961a3862208445132683c6469c7be21b8232c3a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6954fef006431d153de6e63e362b8d260ebeb1c6
\ No newline at end of file
+6730579cf5c6c74cb293e7237d896d3a3a36b691
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 6b5dd683a59b73b6eafa6bc9358de9df03792cd8..097f02323e8356bbd0452facde116dab02a5018e 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -6473,6 +6473,7 @@ static int balance_nonroot(
         ** sibling page j. If the siblings are not leaf pages of an
         ** intkey b-tree, then cell i was a divider cell. */
         assert( j+1 < ArraySize(apCopy) );
+        assert( j+1 < nOld );
         pOld = apCopy[++j];
         iNextOld = i + !leafData + pOld->nCell + pOld->nOverflow;
         if( pOld->nOverflow ){
@@ -8307,4 +8308,3 @@ void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
   assert( mask==BTREE_BULKLOAD || mask==0 );
   pCsr->hints = mask;
 }
-