From: drh <> Date: Tue, 9 Mar 2021 13:12:58 +0000 (+0000) Subject: Update the authorizer in fuzzcheck to align with dbsqlfuzz. X-Git-Tag: version-3.35.0~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=657a7a66c34b051e8421dd9f8e7f3d5e939f292e;p=thirdparty%2Fsqlite.git Update the authorizer in fuzzcheck to align with dbsqlfuzz. FossilOrigin-Name: f86d8fae3b29de014d8bfcae38a15bdb15ddceabfcfff7829f3145cfd69dff2a --- diff --git a/manifest b/manifest index 0949cb9e1e..f31de2901e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\stests\sfor\stoo-tiny\sappended\sDBs,\sclarify\salign\smacro. -D 2021-03-08T20:13:43.440 +C Update\sthe\sauthorizer\sin\sfuzzcheck\sto\salign\swith\sdbsqlfuzz. +D 2021-03-09T13:12:58.120 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 f802e8ab0e7ddaf4a22ca6da0da7b8bda2d6f12662ab93c01987aac29c860766 +F test/fuzzcheck.c aaddd2750fbad511e8d929afc8298a786118f598becc57ee07470c812ffa1e5d 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 9c9ba36e859e330c50ed40ede4b93eeb0a5c3337240465d953a7be9115a81390 -R 4d1785eb4283241007d7b3b4a37989ad -U larrybr -Z 2a5394d1d6ba424c40bac755be51427c +P eb40a8dea6afe6890ddda989de83f3d4ae03b112bf78bfc818dfbd57cc5b5b2a +R 10dcd1428fc8b5891323b2e4e579662a +U drh +Z 6571c1c9e872139e19a5c8b59ef2a9a8 diff --git a/manifest.uuid b/manifest.uuid index 450d9bb242..c4bb8b10d4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -eb40a8dea6afe6890ddda989de83f3d4ae03b112bf78bfc818dfbd57cc5b5b2a \ No newline at end of file +f86d8fae3b29de014d8bfcae38a15bdb15ddceabfcfff7829f3145cfd69dff2a \ No newline at end of file diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c index a5054716ae..332a380392 100644 --- a/test/fuzzcheck.c +++ b/test/fuzzcheck.c @@ -759,9 +759,13 @@ static int block_troublesome_sql( if( sqlite3_stricmp("oom",zArg1)==0 && zArg2!=0 && zArg2[0]!=0 ){ oomCounter = atoi(zArg2); } - }else if( (eCode==SQLITE_ATTACH || eCode==SQLITE_DETACH) - && zArg1 && zArg1[0] ){ - return SQLITE_DENY; + }else if( eCode==SQLITE_ATTACH ){ + if( zArg1!=0 + && zArg1[0]!=0 + && strcmp(zArg1,":memory:")!=0 + ){ + return SQLITE_DENY; + } } return SQLITE_OK; }