From: drh <>
Date: Sat, 18 Jun 2022 14:50:43 +0000 (+0000)
Subject: Abandon a query-invariant check in fuzzcheck if the call to
X-Git-Tag: version-3.39.0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0d21f556591656328d96f22af7d41e22191bf09;p=thirdparty%2Fsqlite.git

Abandon a query-invariant check in fuzzcheck if the call to
sqlite3_bind_value() returns anything other than SQLITE_OK or SQLITE_RANGE.

FossilOrigin-Name: d31e1cd2ab44c7cce20b8990dff17719c286dd2fb46ba6d4f581a9553cf31891
---

diff --git a/manifest b/manifest
index 35b3074eb9..fbe59a3eb7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\s--query-invariants\soption\sof\sfuzzcheck,\scorrectly\sdeal\swith\sOOMs\ncausing\sthe\sreturn\svalue\sof\ssqlite3_column_name()\sto\sbe\sNULL.
-D 2022-06-18T10:26:12.032
+C Abandon\sa\squery-invariant\scheck\sin\sfuzzcheck\sif\sthe\scall\sto\nsqlite3_bind_value()\sreturns\sanything\sother\sthan\sSQLITE_OK\sor\sSQLITE_RANGE.
+D 2022-06-18T14:50:43.710
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1097,7 +1097,7 @@ F test/fuzzdata8.db ca9a97f401b06b0d5376139ec7e1f9e773e13345a9a2d9ccc0032cdbfede
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc
-F test/fuzzinvariants.c 7b30ce794452ed0c976a7e30cf098f8d8552ef485af6682abde9a293133d3cd9
+F test/fuzzinvariants.c d02dbf42821ffee6edf0b202e015ae6c25442cb23a58dbf8abb5db227008b934
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test cc0dbb0ee116e5602e18ea7d47f2a0f76b26e09a823b7c36ef254370c2b0f3c1
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
@@ -1978,8 +1978,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 5eb2c23635320b76f5e1aea4d94375b847fe4b38cdb4e287fba188753f4773b1
-R 5a38f5bef33d12267a14f7a0d1c08cab
+P eabbee4a51bc1a865bddee890004ff3a1c9cc6b797b21f73e908642e154cef50
+R a250da4d7eb0fc648ee3fc57e9bf8333
 U drh
-Z f2d1d961cabe20521b862d120682a7a7
+Z c0f3947dc13c9e02ac56849fd48ded9e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 81e42e2284..182b881adb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eabbee4a51bc1a865bddee890004ff3a1c9cc6b797b21f73e908642e154cef50
\ No newline at end of file
+d31e1cd2ab44c7cce20b8990dff17719c286dd2fb46ba6d4f581a9553cf31891
\ No newline at end of file
diff --git a/test/fuzzinvariants.c b/test/fuzzinvariants.c
index 3b7827a775..a59aab4894 100644
--- a/test/fuzzinvariants.c
+++ b/test/fuzzinvariants.c
@@ -92,7 +92,11 @@ int fuzz_invariant(
   sqlite3_free(zTest);
   nCol = sqlite3_column_count(pStmt);
   for(i=0; i<nCol; i++){
-    sqlite3_bind_value(pTestStmt, i+1+nParam, sqlite3_column_value(pStmt,i));
+    rc = sqlite3_bind_value(pTestStmt,i+1+nParam,sqlite3_column_value(pStmt,i));
+    if( rc!=SQLITE_OK && rc!=SQLITE_RANGE ){
+      sqlite3_finalize(pTestStmt);
+      return rc;
+    }
   }
   if( eVerbosity>=2 ){
     char *zSql = sqlite3_expanded_sql(pTestStmt);