From: drh <drh@noemail.net>
Date: Fri, 20 Dec 2019 12:33:17 +0000 (+0000)
Subject: Fix an assert() in btree.c that can fail if an INSERT is attempted on
X-Git-Tag: version-3.31.0~200
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e5ce8029da34055c0ce32c9ad2b0262e21f1e29;p=thirdparty%2Fsqlite.git

Fix an assert() in btree.c that can fail if an INSERT is attempted on
a corrupted database while in PRAGMA writable_schema=ON.

FossilOrigin-Name: 07beb3629e648e7feae4e786191514339ac1d8f6ba5bb6e7cc8a04bc1f1cd6ab
---

diff --git a/manifest b/manifest
index 1b00d4ecdb..348e689bf5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Continuation\sof\s[e2bddcd4c55ba3cb]:\sAdd\sanother\sspot\swhere\sit\sis\snecessary\nto\sabort\searly\sdue\sto\sprior\serrors\sin\ssqlite3WindowRewrite().
-D 2019-12-19T22:08:19.301
+C Fix\san\sassert()\sin\sbtree.c\sthat\scan\sfail\sif\san\sINSERT\sis\sattempted\son\na\scorrupted\sdatabase\swhile\sin\sPRAGMA\swritable_schema=ON.
+D 2019-12-20T12:33:17.322
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -468,7 +468,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c d22498af716953400e314d2d98d1dac3ea5c3b01e0fd243ef9e9b132c74114ec
+F src/btree.c 716fc9bd12eb7d35e3d66c5c2c81c37df3fdae49cd25bceaff4e7d702d513d80
 F src/btree.h f27a33c49280209a93385e218306c4ee5f46ba8d7649d2f81a7166b282232484
 F src/btreeInt.h 91806f01fd1145a9a86ba3042f25c38d8faf6002701bf5e780742cf88bcff437
 F src/build.c 358e894867394839679982d2fe320fb44fd17c94a87feb898aa066c15a8066ea
@@ -1017,7 +1017,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db e7a86fd83dda151d160445d542e32e5c6019c541b3a74c2a525b6ac640639711
-F test/fuzzdata8.db b45368bbe9f86d40d30603e8f780ac29807cbcc951a18d7a7fd9d0c0e904706e
+F test/fuzzdata8.db d89020bec89dfe98562b15629be034015d12d5d4fc238384be25f2235bf5c985
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
@@ -1852,7 +1852,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 3d4c0bf8904135fa68c75801bfa738715cacc3b19dc8ad6ef550b11798d4b121
-R 5ae11b0f596e58f50666a1f36d76218a
+P cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2
+R e3918c2a6ba03e1f611ead25e050c496
 U drh
-Z a0201de5777363689738ee935bfc3b28
+Z c83ab72a8d54d736b94a005afabccf03
diff --git a/manifest.uuid b/manifest.uuid
index 3d142a4fef..61cfc90be4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cba2a2a44cdf138a629109bb0ad088ed4ef67fc66bed3e0373554681a39615d2
\ No newline at end of file
+07beb3629e648e7feae4e786191514339ac1d8f6ba5bb6e7cc8a04bc1f1cd6ab
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index d0eed5dd43..98f9ec2d62 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -8706,7 +8706,9 @@ int sqlite3BtreeInsert(
     }
 
   }
-  assert( pCur->eState==CURSOR_VALID || (pCur->eState==CURSOR_INVALID && loc) );
+  assert( pCur->eState==CURSOR_VALID 
+       || (pCur->eState==CURSOR_INVALID && loc)
+       || CORRUPT_DB );
 
   pPage = pCur->pPage;
   assert( pPage->intKey || pX->nKey>=0 );
diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db
index 820ff08a28..94e0e0bde2 100644
Binary files a/test/fuzzdata8.db and b/test/fuzzdata8.db differ