From: dan <Dan Kennedy>
Date: Tue, 12 Apr 2022 17:02:27 +0000 (+0000)
Subject: Earlier detection of corruption in balance_nonroot(). dbsqlfuzz 9191ade77ebd3b7a3356e... 
X-Git-Tag: version-3.39.0~218
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6625d6d8736ac11d87bed407e1e08268ef554f45;p=thirdparty%2Fsqlite.git

Earlier detection of corruption in balance_nonroot(). dbsqlfuzz 9191ade77ebd3b7a3356e074957aa85b0c669d14.

FossilOrigin-Name: bff4f083eb1c35544988493a5d73a42e646c4250b841f5aae38c2183f0867a0e
---

diff --git a/manifest b/manifest
index 0428ce8b73..a5a6f9b519 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sutility\sfunction\ssqlite3SetString()\sso\sthat\sit\smay\sbe\sused\ssafely\son\sParse.zErrMsg.\sFuzzer\stest\scase\s"crash-1604e5d76c92574e21e437049dab9b672e06b767.txt".
-D 2022-04-12T11:02:06.896
+C Earlier\sdetection\sof\scorruption\sin\sbalance_nonroot().\sdbsqlfuzz\s9191ade77ebd3b7a3356e074957aa85b0c669d14.
+D 2022-04-12T17:02:27.322
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -492,7 +492,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf
 F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7
 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 45161c2d5c9527b9c9bbfd7478daf3e0a619cf4bbe3278378aaea3d4b4e4f5b5
+F src/btree.c c5ede430f700fef60a7b770b64f05071099042fbde87c3e72363baa06e98574b
 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22
 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e
 F src/build.c ff119be98394a65bc8be7afc39d4a791a66f03a778d396de3ec456f5dfaf39e8
@@ -1945,8 +1945,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P e8c00442d2daedec079748d13147bf73b0ec3c3cf432bce2cdccb706bdff2853
-R ce69914b0449933d45ec56e1376c0a3b
+P 09c5a4ec13b02efd6207e26dab7beaf184f0d8ccea0bd0dfe94fc803fe5636ce
+R d18f99fed866e9865bcdfe9b0a30dad2
 U dan
-Z 3e44eca52a4693d55a51d186d7ab15b4
+Z 6817a1ac7fab2812dd812cb873794720
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 131b4fe466..919aafb7a6 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-09c5a4ec13b02efd6207e26dab7beaf184f0d8ccea0bd0dfe94fc803fe5636ce
\ No newline at end of file
+bff4f083eb1c35544988493a5d73a42e646c4250b841f5aae38c2183f0867a0e
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index 9e721ee5af..cf92eecd80 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8491,7 +8491,7 @@ static int balance_nonroot(
     iOvflSpace += sz;
     assert( sz<=pBt->maxLocal+23 );
     assert( iOvflSpace <= (int)pBt->pageSize );
-    for(k=0; b.ixNx[k]<=i && ALWAYS(k<NB*2); k++){}
+    for(k=0; b.ixNx[k]<=j && ALWAYS(k<NB*2); k++){}
     pSrcEnd = b.apEnd[k];
     if( SQLITE_WITHIN(pSrcEnd, pCell, pCell+sz) ){
       rc = SQLITE_CORRUPT_BKPT;