]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Do not allow large busy_timeout pragmas in fuzzcheck, as they accomplish
authordrh <>
Mon, 25 Oct 2021 12:54:23 +0000 (12:54 +0000)
committerdrh <>
Mon, 25 Oct 2021 12:54:23 +0000 (12:54 +0000)
nothing other than making the tests unnecessarily slow.

FossilOrigin-Name: fba441bf9f6ed729a66ccd4e42b5a8859bf3952d70a66bc9a2496ec49d90a60c

manifest
manifest.uuid
test/fuzzcheck.c

index 8ad190687f18f97c078edba66a9af9bc5c643bc7..a581a6ff994d6d8f751b955809131c281b5cebd5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improve\sthe\sauthorizer\sfilter\sfor\sATTACH\son\sfuzzcheck.
-D 2021-10-23T22:14:11.249
+C Do\snot\sallow\slarge\sbusy_timeout\spragmas\sin\sfuzzcheck,\sas\sthey\saccomplish\nnothing\sother\sthan\smaking\sthe\stests\sunnecessarily\sslow.
+D 2021-10-25T12:54:23.541
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1055,7 +1055,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 a86cc34bcc91c4a882cbac0ccc7c903d27c2a520bd6006510b3371e7befdd09b
+F test/fuzzcheck.c 0bb10903f3059b2cf006dd9db081159661360e9abcc8bc5ea61d2adcf9ec4c3e
 F test/fuzzdata1.db d36e88741b4f23bcbaaf55b006290669d03c6c891cf13c7b3a53bc1b097b693f
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1929,7 +1929,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 5218ac788ca35fdd7f98117758f0bef9d55fe7517098e7bf62fda3fed2af3d51
-R 17548d134303a4e483245fa3f87d916c
+P 87d49e80878674470d280de79c8ade222dd006e65c90e79616c4f72c7c32dabb
+R bc4bb1c85a5699919f19901db43f7f5f
 U drh
-Z 9ccb24f9c373f9b4367082008057e6de
+Z 82f19ae953cfc65c5ff84d970cd775e3
index 28fbef41bcd7e13eb120d08b20ad3cc865762460..488b1da4a1e3baa6b62e4aad5f958b43ac4ebafe 100644 (file)
@@ -1 +1 @@
-87d49e80878674470d280de79c8ade222dd006e65c90e79616c4f72c7c32dabb
\ No newline at end of file
+fba441bf9f6ed729a66ccd4e42b5a8859bf3952d70a66bc9a2496ec49d90a60c
\ No newline at end of file
index ee709d3e4e565bee695dfca5d6909dcf2cce385d..922095cb33c3d6785f9e621a5a6859fd5f0fb2cb 100644 (file)
@@ -750,7 +750,11 @@ static int block_troublesome_sql(
   (void)zArg3;
   (void)zArg4;
   if( eCode==SQLITE_PRAGMA ){
-   if( eVerbosity==0 ){
+    if( sqlite3_stricmp("busy_timeout",zArg1)==0
+     && (zArg2==0 || atoi(zArg2)>100)
+    ){
+      return SQLITE_DENY;
+    }else if( eVerbosity==0 ){
       if( sqlite3_strnicmp("vdbe_", zArg1, 5)==0
        || sqlite3_stricmp("parser_trace", zArg1)==0
        || sqlite3_stricmp("temp_store_directory", zArg1)==0