From: drh Date: Fri, 2 Aug 2019 21:03:24 +0000 (+0000) Subject: Fixes to the PRNG_SEED pragma idea. X-Git-Tag: version-3.30.0~174^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6e96b1b45b28a1fdb96af673604bb33dc9f5658;p=thirdparty%2Fsqlite.git Fixes to the PRNG_SEED pragma idea. FossilOrigin-Name: c71098409c98af8360f8f28b9238a12ec764018a5782e8ff03fdf5db54031d6e --- diff --git a/manifest b/manifest index 47da76a216..0b52767182 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_TESTCTRL_PRNG_SEED\stest\scontrol. -D 2019-08-02T20:45:04.317 +C Fixes\sto\sthe\sPRNG_SEED\spragma\sidea. +D 2019-08-02T21:03:24.230 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -533,7 +533,7 @@ F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 F src/tclsqlite.c cfe7f93daf9d8787f65e099efb67d7cdfc2c35236dec5d3f6758520bd3519424 -F src/test1.c fd8a05277bebf42cea5d8c8d1f272cf8dc69e838bbc4f14f547b9810f2d689fb +F src/test1.c 2139262641607bf3b5fc8d651b344233695f622bf477b4cbb55182b93251fe6b F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb @@ -797,7 +797,7 @@ F test/dbdata.test 042f49acff3438f940eeba5868d3af080ae64ddf26ae78f80c92bec3ca7d8 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e F test/dbfuzz001.test e32d14465f1c77712896fda6a1ccc0f037b481c191c1696a9c44f6c9e4964faf F test/dbfuzz2-seed1.db e6225c6f3d7b63f9c5b6867146a5f329d997ab105bee64644dc2b3a2f2aebaee -F test/dbfuzz2.c b93db9056ad057733463ba333f89d2d195a95155805065c5962422955d7fb011 +F test/dbfuzz2.c 2a7adaa5716f3d8f1928dd9fc1a72dfe1a9437c6e763e2cb953f27576387ae48 F test/dbpage.test 650234ba683b9d82b899c6c51439819787e7609f17a0cc40e0080a7b6443bc38 F test/dbstatus.test cd83aa623b8aab477269bc94cf8aa90c1e195a144561dd04a1620770aaa8524e F test/dbstatus2.test f5fe0afed3fa45e57cfa70d1147606c20d2ba23feac78e9a172f2fe8ab5b78ef @@ -1004,7 +1004,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2 -F test/fuzzcheck.c d0e76671ea5c3a766768b65d69f7d755aa614a98c17b84fa4496f4cd2e2fa515 +F test/fuzzcheck.c 3f07fef9ef333ffd06b77e68f698b1daed9339b69308a8d83a9d64e30fa3b43a F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba @@ -1838,10 +1838,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 faaaae4940b5f4f70e4988ad5b45582410b381ace0031e6abcde0b9217c06796 -R cc4f195b7834252acf2666d4e1ada0cd -T *branch * prng-seed-test-control -T *sym-prng-seed-test-control * -T -sym-trunk * +P 3ac5723164ae801e209ce525a5d94692767136f9d06be2a84883dcea677d02da +R 7c1b13735fcb01fd3eed4bb028d38797 U drh -Z 787ec1171fdf2c223779ee565290b12f +Z db22194a3a99057abc0b1999051a8fec diff --git a/manifest.uuid b/manifest.uuid index 31a61510ed..ca8bda57c6 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3ac5723164ae801e209ce525a5d94692767136f9d06be2a84883dcea677d02da \ No newline at end of file +c71098409c98af8360f8f28b9238a12ec764018a5782e8ff03fdf5db54031d6e \ No newline at end of file diff --git a/src/test1.c b/src/test1.c index c582bb3a02..51eb2cc361 100644 --- a/src/test1.c +++ b/src/test1.c @@ -6392,7 +6392,7 @@ static int SQLITE_TCLAPI prng_seed( Tcl_WrongNumArgs(interp, 1, objv, "PRNG-SEED-TEXT"); return TCL_ERROR; } - if( Tcl_GetIntFromObj(objv[0],&i) ) return TCL_ERROR; + if( Tcl_GetIntFromObj(interp,objv[0],&i) ) return TCL_ERROR; sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, (unsigned int)i); sqlite3_randomness(0,0); return TCL_OK; diff --git a/test/dbfuzz2.c b/test/dbfuzz2.c index 025204dcf9..3f3a477387 100644 --- a/test/dbfuzz2.c +++ b/test/dbfuzz2.c @@ -211,6 +211,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *aData, size_t nByte){ if( mxCb>0 ){ sqlite3_progress_handler(db, 10, progress_handler, 0); } +#ifdef SQLITE_TESTCTRL_PRNG_SEED + sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, 0); + sqlite3_randomness(0,0); +#endif for(i=0; i=1 ){ printf("%s\n", azSql[i]); diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c index 4096f845d1..50079cf499 100644 --- a/test/fuzzcheck.c +++ b/test/fuzzcheck.c @@ -1805,6 +1805,10 @@ int main(int argc, char **argv){ sqlite3_progress_handler(db, 100000, progressHandler, &vdbeLimitFlag); } +#endif +#ifdef SQLITE_TESTCTRL_PRNG_SEED + sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, 0); + sqlite3_randomness(0,0); #endif do{ runSql(db, (char*)pSql->a, runFlags);