Improvement to the ATTACH-abuse authorizer logic in fuzzcheck.

FossilOrigin-Name: 88132f698a7a9b7d41dd1dd393592cbda130d2bf1a9fd18c509503e1891b9655

diff --git a/manifest b/manifest
index 12d36067209c1a9c75136213dd38c1b55319c756..ec4d4809a8459f8447d65b5487bb628faafca141 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\savfs.test\swhen\stesting\sSQLITE_OMIT_VIRTUALTABLE\sbuilds.
-D 2021-03-10T17:43:18.428
+C Improvement\sto\sthe\sATTACH-abuse\sauthorizer\slogic\sin\sfuzzcheck.
+D 2021-03-10T17:52:59.889
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1045,7 +1045,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 aaddd2750fbad511e8d929afc8298a786118f598becc57ee07470c812ffa1e5d
+F test/fuzzcheck.c 8f83829e6c4da26abf6aded7fe9f04e56d46a418c8d7b8b67e14cf6f2ee0a25c
 F test/fuzzdata1.db d36e88741b4f23bcbaaf55b006290669d03c6c891cf13c7b3a53bc1b097b693f
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1910,7 +1910,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 7b65fb9f7bd616f834633afd64b3448bf9ca2b6e4cc6d6c01e75d1d877c88a79
-R b384c5b91576c59be44e657e1c500b11
-U dan
-Z 42a4775fe609f75933ebf491e0b55c30
+P 2ab6957a2238a2ab713a50d21dbd9921c944e8141197275bbfe7dae303fee7d0
+R 238c59e570a2c7057b45eb0374388222
+U drh
+Z 1a4dc37d8791bd05f2ae1bef6a480f59

diff --git a/manifest.uuid b/manifest.uuid
index a7e46719a0ddbd08d9a5cae6787be3e0784e47c6..0a680ac84bbe7141c79e845929918bf9c63678a7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2ab6957a2238a2ab713a50d21dbd9921c944e8141197275bbfe7dae303fee7d0
\ No newline at end of file
+88132f698a7a9b7d41dd1dd393592cbda130d2bf1a9fd18c509503e1891b9655
\ No newline at end of file

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 332a380392b0e61961e2b6675a7812412fb6ac2e..b1117ce378e0a7d252352e77e66f2676e5eb5ec5 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -760,10 +760,7 @@ static int block_troublesome_sql(
       oomCounter = atoi(zArg2);
     }
   }else if( eCode==SQLITE_ATTACH ){
-    if( zArg1!=0
-     && zArg1[0]!=0
-     && strcmp(zArg1,":memory:")!=0
-    ){
+    if( zArg1==0 || (zArg1[0]!=0 && strcmp(zArg1,":memory:")!=0) ){
       return SQLITE_DENY;
     }
   }