From 629c2eaf46f35ef04410243350ae336616490345 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 26 Oct 2021 09:53:51 +0000 Subject: [PATCH] Fix the busy_timeout restriction on fuzzcheck so that it can deal with hexadecimal integer literals. FossilOrigin-Name: 4b41535b096dec4b15a85e657102a72d4288728da6103f3fdcbe0e6f244c673a --- manifest | 12 ++++++------ manifest.uuid | 2 +- test/fuzzcheck.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 545b6fa316..aa67b05119 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sa\sNEVER()\sin\srebuildPage\sthat\sis\sreachable,\sas\sis\sdemonstrated\sby\ndbsqlfuzz\scase\sbeac09b2756b5d285aa68f9737fdb06c972f159a. -D 2021-10-25T18:51:56.300 +C Fix\sthe\sbusy_timeout\srestriction\son\sfuzzcheck\sso\sthat\sit\scan\sdeal\swith\nhexadecimal\sinteger\sliterals. +D 2021-10-26T09:53:51.938 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 0bb10903f3059b2cf006dd9db081159661360e9abcc8bc5ea61d2adcf9ec4c3e +F test/fuzzcheck.c 5773a888c10080da4a3174b19136631a787735a0ee44aa1bc0078384b2caeb13 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 fba441bf9f6ed729a66ccd4e42b5a8859bf3952d70a66bc9a2496ec49d90a60c -R b046afa0c3d079723fde3f7c27c80f0b +P ac3f617827e06800d26ef688c5f5480b9621676f141d2eac134f877e0c454149 +R aaa4122ff484e5344bdfc79be4d2bdda U drh -Z 7cee34f3c763c52a086ac43f9a7fefb9 +Z 44dd105d0edba620f6048dd47ca2265d diff --git a/manifest.uuid b/manifest.uuid index 9772a0f585..06a6268c02 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ac3f617827e06800d26ef688c5f5480b9621676f141d2eac134f877e0c454149 \ No newline at end of file +4b41535b096dec4b15a85e657102a72d4288728da6103f3fdcbe0e6f244c673a \ No newline at end of file diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c index 922095cb33..66e64c4c83 100644 --- a/test/fuzzcheck.c +++ b/test/fuzzcheck.c @@ -751,7 +751,7 @@ static int block_troublesome_sql( (void)zArg4; if( eCode==SQLITE_PRAGMA ){ if( sqlite3_stricmp("busy_timeout",zArg1)==0 - && (zArg2==0 || atoi(zArg2)>100) + && (zArg2==0 || strtoll(zArg2,0,0)>100) ){ return SQLITE_DENY; }else if( eVerbosity==0 ){