Do not allow an SQLITE_CORRUPT error to mask a prior SQLITE_IOERR in

balance_nonroot().  dbsqlfuzz 5e1c86e7f18023f2b9abe3429977d7ea726f50d8

FossilOrigin-Name: 50e818767e423991b99b3155cb15a0d1c1b744ab6139a8273f9348aab9a53d9c

diff --git a/manifest b/manifest
index 7d36e6ee78de4de42c36e879669288f27005b579..3c3956ab19e1518b70f2efef65c24a489f89ae32 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunnecessary\s(redundant)\svariable\sinitialization\sfrom\nsqlite3BtreeInsert()\sfor\sa\ssmall\ssize\sreduction\sand\sperformance\sincrease.
-D 2021-06-19T20:20:23.249
+C Do\snot\sallow\san\sSQLITE_CORRUPT\serror\sto\smask\sa\sprior\sSQLITE_IOERR\sin\nbalance_nonroot().\s\sdbsqlfuzz\s5e1c86e7f18023f2b9abe3429977d7ea726f50d8
+D 2021-06-20T22:17:49.519
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -485,7 +485,7 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 5c6533683f1ece5159a6e4a2cbbf71dd9b3ff75c4748998497ad37870578c3d4
+F src/btree.c df7f1f926d7a5aa7687f93f63eddf8dfc2c4156cb4d6dfb3fd00c54180446198
 F src/btree.h ace9c1c243612bb95c32d848e3f9e159340c2caefcb68412b441569f56328f65
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c ea28944f65b04f771e7aa5d614d406faa1bde5fe4ce882e2ead73049f03ed568
@@ -1918,7 +1918,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2eb6697051c13bf0cc3772fd6c16bfdea0be3b01c0d985e05004c04eaf7a4a48
-R f4744447deeee4d736853bd310124014
+P 70d1836474207fa045ff7aa513839c9df26ea6e180eb898b30d89bd5b3833f58
+R 177db51702586a2991feeee2ddea1f57
 U drh
-Z d23a58a69ada4da5b4f1a357cc1eef9e
+Z e0ef153a9222b50c9eeb03894347cc76

diff --git a/manifest.uuid b/manifest.uuid
index 923919bed68978da5fca6b43c51db0e1e565607f..0b302acc910ce881422213d3e58449057f867521 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-70d1836474207fa045ff7aa513839c9df26ea6e180eb898b30d89bd5b3833f58
\ No newline at end of file
+50e818767e423991b99b3155cb15a0d1c1b744ab6139a8273f9348aab9a53d9c
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 2f7e398f39864395f7d6a10e6e01b68127b25e6b..f6e31513ad0384638c120b13959bf05b14964129 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -8081,7 +8081,9 @@ static int balance_nonroot(
       apOld[i] = 0;
       rc = sqlite3PagerWrite(pNew->pDbPage);
       nNew++;
-      if( sqlite3PagerPageRefcount(pNew->pDbPage)!=1+(i==(iParentIdx-nxDiv)) ){
+      if( sqlite3PagerPageRefcount(pNew->pDbPage)!=1+(i==(iParentIdx-nxDiv))
+       && rc==SQLITE_OK
+      ){
         rc = SQLITE_CORRUPT_BKPT;
       }
       if( rc ) goto balance_cleanup;