From: drh <>
Date: Thu, 29 Apr 2021 18:03:42 +0000 (+0000)
Subject: Fix the operation of the "-" argument to --load-dbsql in the fuzzcheck program.
X-Git-Tag: version-3.36.0~129
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5960724789db65474f39bb78b555f4d93638016d;p=thirdparty%2Fsqlite.git

Fix the operation of the "-" argument to --load-dbsql in the fuzzcheck program.

FossilOrigin-Name: 1f18b3cbee7e1342fdd66e45ef744fea3db2ba4513943c0582ff8ef98974865e
---

diff --git a/manifest b/manifest
index 6b37cd82f0..157d4a535b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sIN-early-out\soptimization\sso\sthat\sit\sworks\seven\sfor\sthe\scorner\scase\nwhere\sthe\sNULL\sbypass\sfires\sbefore\sthe\saffinity\sof\sthe\sLHS\soperator\shas\sbeen\nset.\s\sFix\sfor\sthe\sproblem\sdescribed\sin\n[forum:/forumpost/6a3ec138e9|forum\spost\s6a3ec138e9].
-D 2021-04-29T15:49:34.719
+C Fix\sthe\soperation\sof\sthe\s"-"\sargument\sto\s--load-dbsql\sin\sthe\sfuzzcheck\sprogram.
+D 2021-04-29T18:03:42.662
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1049,7 +1049,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 59bcbb5f5c6dcec4f6f5c4e4456b5dc7211ea893f2204c80ceb4277bba83fb9b
+F test/fuzzcheck.c c51cdb34e926d0a6551624aa1f04c456c29317b5457855d64391917d9b4c2aff
 F test/fuzzdata1.db d36e88741b4f23bcbaaf55b006290669d03c6c891cf13c7b3a53bc1b097b693f
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1914,7 +1914,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 683950009300657b0321d7d3f77f2585a28696ff93cedef399d1cd4aa484b2d4
-R 2fa8e2441473674deda1256a612f82a3
+P eb40248ce606b792a02e4e0b7dd826a82891c5f4c9793f3ca5d332e593109525
+R d43ef4a20157a0eacec2793f290bf114
 U drh
-Z cf36b9a5e331b2b6911dc39680ad6acd
+Z a90baec8909dfb2492fec48bd614d8da
diff --git a/manifest.uuid b/manifest.uuid
index 868533c555..c256a87cc1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eb40248ce606b792a02e4e0b7dd826a82891c5f4c9793f3ca5d332e593109525
\ No newline at end of file
+1f18b3cbee7e1342fdd66e45ef744fea3db2ba4513943c0582ff8ef98974865e
\ No newline at end of file
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index e7fa5261b8..6ec2f8460c 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -1784,14 +1784,16 @@ int main(int argc, char **argv){
           char zLine[2000];
           while( rc==0 && fgets(zLine,sizeof(zLine),stdin)!=0 ){
             size_t kk = strlen(zLine);
-            while( kk>0 && (zLine[kk]=='\n' || zLine[kk]=='\r')) kk--;
+            while( kk>0 && zLine[kk-1]<=' ' ) kk--;
             sqlite3_bind_text(pStmt, 1, zLine, kk, SQLITE_STATIC);
+            if( verboseFlag ) printf("loading %.*s\n", (int)kk, zLine);
             sqlite3_step(pStmt);
             rc = sqlite3_reset(pStmt);
             if( rc ) fatalError("insert failed for %s", zLine);
           }
         }else{
           sqlite3_bind_text(pStmt, 1, argv[i], -1, SQLITE_STATIC);
+          if( verboseFlag ) printf("loading %s\n", argv[i]);
           sqlite3_step(pStmt);
           rc = sqlite3_reset(pStmt);
           if( rc ) fatalError("insert failed for %s", argv[i]);