Fix a faulty assert() statement - adding a CORRUPT_DB term - based on a test

case derived from [562805cf488a455c].  Also add a test case to that prior
issue.

FossilOrigin-Name: f9505fcb28d05ac2319a56d936f840b8de502a49dda16ded8b7ed9dd9dffe509

diff --git a/manifest b/manifest
index db81bcf3d30b6e0e02646a6ec38685127bf3507a..b8725ffe7dd26e9da79e422e92ab84e15cf287d6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sseen\swith\sMSVC.
-D 2022-01-02T17:02:54.187
+C Fix\sa\sfaulty\sassert()\sstatement\s-\sadding\sa\sCORRUPT_DB\sterm\s-\sbased\son\sa\stest\ncase\sderived\sfrom\s[562805cf488a455c].\s\sAlso\sadd\sa\stest\scase\sto\sthat\sprior\nissue.
+D 2022-01-02T17:13:36.819
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -512,7 +512,7 @@ F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
-F src/insert.c 9b133400f1c7f6d83ca14565e9cf4d2b9b8c938123b5d6793ae2fccb85c52834
+F src/insert.c 3bec59e34f7b6078c73e21dd97aee2a7830a3096afe7b9541a14f273e7f709ec
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c e1dcff1c916bf6834e150b492eddda5d9792453182d2ad64294d2266b6e93c4c
 F src/main.c 1ea70751e6005ab6a9f784730fa0919efaa6639440a287deb73cb711e5aae57a
@@ -908,7 +908,7 @@ F test/filter1.test 6c483ecf7886c8843a8612c021aa23f33c581f584151f251842b3a3592c9
 F test/filter2.tcl 44e525497ce07382915f01bd29ffd0fa49dab3adb87253b5e5103ba8f93393e8
 F test/filter2.test 485cf95d1f6d6ceee5632201ca52a71868599836f430cdee42e5f7f14666e30a
 F test/filterfault.test c08fb491d698e8df6c122c98f7db1c65ffcfcad2c1ab0e07fa8a5be1b34eaa8b
-F test/fkey1.test 03503639d266d565db90ee3b8fe211ba446624030ac4eb24895cec265e9631d0
+F test/fkey1.test 55663090ab6735319a52647057b9f19f8ec8c6c7d7da25170b71a75e3e5bdeb7
 F test/fkey2.test 1063d65e5923c054cfb8f0555a92a3ae0fa8c067275a33ee1715bd856cdb304c
 F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
@@ -1934,9 +1934,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P ee8b2397a67c14badb836570f815ca6c59f6936100669adafe815d7cb997cb43
-Q +a9bfb621091b6d92d1caeb69134d3809d9e0b43fe764608c5995db277ac785be
-R ba4ff0e26d0561653f89826cad6b5b02
+P 6e08a542ad6af7032e5badcdd50a8ed95c07bf7b15ae2b62334376b75a2e9731
+Q +0dd6b5fccd554ebe4c0b081601863acd7b6ea81b51e14b508b23244f2a570e7e
+R 546f8af2140b29fdcd963f6678b5f14a
 U drh
-Z 8e127eac5f5d0d5b08314b6a715a505c
+Z bcfdef18e85690bf0e291dc88ba3992a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8451825ebb3f7c2f84c206cdff66798ba0c0585d..208ebf351e3536792e96350305ca412e036e4666 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e08a542ad6af7032e5badcdd50a8ed95c07bf7b15ae2b62334376b75a2e9731
\ No newline at end of file
+f9505fcb28d05ac2319a56d936f840b8de502a49dda16ded8b7ed9dd9dffe509
\ No newline at end of file

diff --git a/src/insert.c b/src/insert.c
index 4bd94e486b32802f6253d03b1b2cebac99a7554b..c3316b826bae422e87b037fd866001cf81890fb3 100644 (file)
--- a/src/insert.c
+++ b/src/insert.c
@@ -43,7 +43,7 @@ void sqlite3OpenTable(
   }else{
     Index *pPk = sqlite3PrimaryKeyIndex(pTab);
     assert( pPk!=0 );
-    assert( pPk->tnum==pTab->tnum );
+    assert( pPk->tnum==pTab->tnum || CORRUPT_DB );
     sqlite3VdbeAddOp3(v, opcode, iCur, pPk->tnum, iDb);
     sqlite3VdbeSetP4KeyInfo(pParse, pPk);
     VdbeComment((v, "%s", pTab->zName));

diff --git a/test/fkey1.test b/test/fkey1.test
index 13635db9873f26c0e625ba90fa0544d841621473..db93be501dc522cc0325d2a4c5535f43832da2ce 100644 (file)
--- a/test/fkey1.test
+++ b/test/fkey1.test
@@ -241,5 +241,35 @@ do_execsql_test 7.2 {
   PRAGMA foreign_key_check;
 } {}
 
+# 2021-12-31 forum https://sqlite.org/forum/forumpost/24bd1fef7e9323ef
+# Memory leak caused by sqlite3NestedParse() running on a corrupt system
+# table.  Discovered by Jingzhou Fu.
+#
+reset_db
+do_execsql_test 8.1 {
+  PRAGMA writable_schema=ON;
+  PRAGMA foreign_keys = ON;
+  CREATE TABLE sqlite_stat1 (tbl INTEGER PRIMARY KEY DESC, idx UNIQUE DEFAULT NULL) WITHOUT ROWID;
+  PRAGMA writable_schema=OFF;
+  CREATE TABLE sqlsim4(stat PRIMARY KEY);;
+  CREATE TABLE t1(sqlsim7 REFERENCES sqlite_stat1 ON DELETE CASCADE);
+  DROP table "sqlsim4";
+} {}
+# 2022-01-01 dbsqlfuzz 1c57440219f6f0aedf5e8f72a8ddd75f15aea381
+# Follow-up case to the above.  Assertion is not true if the schema
+# is corrupt.
+reset_db
+database_may_be_corrupt
+do_execsql_test 8.2 {
+  CREATE TABLE t1(a REFERENCES sqlite_stat1 ON DELETE CASCADE);
+  CREATE TABLE t2(a TEXT PRIMARY KEY);
+  PRAGMA writable_schema=ON;
+  CREATE TABLE sqlite_stat1(tbl INTEGER PRIMARY KEY DESC, idx UNIQUE DEFAULT NULL) WITHOUT ROWID;
+  UPDATE sqlite_schema SET name='sqlite_autoindex_sqlite_stat1_1' WHERE name='sqlite_autoindex_sqlite_stat1_2';
+  PRAGMA writable_schema=RESET;
+} {}
+do_catchsql_test 8.3 {
+  REINDEX;
+} {1 {database disk image is malformed}}
 
 finish_test