From: drh <drh@noemail.net>
Date: Sat, 3 Aug 2019 01:39:20 +0000 (+0000)
Subject: Give the SQLITE_TESTCTRL_PRNG_SEED two arguments.  The second argument if not
X-Git-Tag: version-3.30.0~174^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e6d83bc498c7f3c49c72ac96887228336966db3;p=thirdparty%2Fsqlite.git

Give the SQLITE_TESTCTRL_PRNG_SEED two arguments.  The second argument if not
NULL is a pointer to a database connection which seeds the connection from
its schema cookie.  In this way, fuzzers can control the PRNG seed.

FossilOrigin-Name: 49aa34480622cce4d7a72c59d9cfa8336886387acec8ee15b72f295ea1a52d8c
---

diff --git a/manifest b/manifest
index 0b52767182..e1120f6aa1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixes\sto\sthe\sPRNG_SEED\spragma\sidea.
-D 2019-08-02T21:03:24.230
+C Give\sthe\sSQLITE_TESTCTRL_PRNG_SEED\stwo\sarguments.\s\sThe\ssecond\sargument\sif\snot\nNULL\sis\sa\spointer\sto\sa\sdatabase\sconnection\swhich\sseeds\sthe\sconnection\sfrom\nits\sschema\scookie.\s\sIn\sthis\sway,\sfuzzers\scan\scontrol\sthe\sPRNG\sseed.
+D 2019-08-03T01:39:20.466
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -464,7 +464,7 @@ F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c f70077d40c08b7787bfe934e4d1da8030cb0cc57d46b345fba2294b7d1be23ab
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 58d002f711c41a50a1183b5880b2e30fcd2363962df1ecf25731d011a796ee94
+F src/btree.c 4f122e985d939452677e67ce777a8ac68737c96a6e47aa0a4620e574b31bed0c
 F src/btree.h c11446f07ec0e9dc85af8041cb0855c52f5359c8b2a43e47e02a685282504d89
 F src/btreeInt.h 6111c15868b90669f79081039d19e7ea8674013f907710baa3c814dc3f8bfd3f
 F src/build.c 48f22e7c3b80550eb9c0cc3a3738f9117109b87d5f5fdba027009b7f2917df4a
@@ -487,7 +487,7 @@ F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c f20925c2c08144442dabeb73dcd0f5026f5f085d827f3d5635f7c45e5d195320
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 22afc33c3a61b4fd80a60a54f1882688371e6bc64685df2696b008fce65a999c
-F src/main.c e30b0b22666f7e1e0bb6c8d051d5201bd85419eca8c2423ffe7b1bce6364653a
+F src/main.c ddba2dd3c8b11ad1d2ecc146a85a459c50a9a6b592ff154246a5db44d601d64f
 F src/malloc.c 0f9da2a66b230a5785af94b9672126845099b57b70a32c987d04ac28c69da990
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
@@ -503,7 +503,7 @@ F src/mutex_noop.c 9d4309c075ba9cc7249e19412d3d62f7f94839c4
 F src/mutex_unix.c aaf9ebc3f89df28483c52208497a99a02cc3650011422fc9d4c57e4392f7fe58
 F src/mutex_w32.c 7670d770c94bbfe8289bec9d7f1394c5a00a57c37f892aab6b6612d085255235
 F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
-F src/os.c 033039bb9b6da7d163c1806ba0d4dc0be9748ed78d8490c018bfd2346b774c1e
+F src/os.c 66948e071d5ba7ae9ca5839799fdf68159f059cb97cada8a07eaf95a56edce79
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
@@ -524,7 +524,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6d57cfcb728fe1513fcbfb2bbd4192838b8cfe094616f72c7a54be55a550cc84
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 1b8b5afee76e7d662b34c61705a638f7a6a20d5109515ca973c12343c84fb2d6
-F src/shell.c.in 5ab94c68a555b573a28e2ccdd811cc9ab8e0dd79274dad52567056fa6830d061
+F src/shell.c.in e5351f14716065d6e00a0437d3910cbb1a9d4fa96af61f59f18e5623679fe605
 F src/sqlite.h.in dfe86c132b5085e00cf0539c78510b75e60d740191804c9848e8bb7aa850fff5
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -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 2139262641607bf3b5fc8d651b344233695f622bf477b4cbb55182b93251fe6b
+F src/test1.c 18f980ceb2611d2cfc59da8bde7dfb4f12f235a6c91bf85ca6efdf855c34493f
 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 2a7adaa5716f3d8f1928dd9fc1a72dfe1a9437c6e763e2cb953f27576387ae48
+F test/dbfuzz2.c c2c9cb40082a77b7e95ffb8b2da1e93322efadfb1c8c1e0001c95a0af1e156c2
 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 3f07fef9ef333ffd06b77e68f698b1daed9339b69308a8d83a9d64e30fa3b43a
+F test/fuzzcheck.c 3ad76298a80cda31d270dc5e4f31194fa38d507d3e9b3f355cf1c283895cd5a5
 F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1838,7 +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 3ac5723164ae801e209ce525a5d94692767136f9d06be2a84883dcea677d02da
-R 7c1b13735fcb01fd3eed4bb028d38797
+P c71098409c98af8360f8f28b9238a12ec764018a5782e8ff03fdf5db54031d6e
+R 4b4e0ecd3d28a8dbcf6d6e7975ad293a
 U drh
-Z db22194a3a99057abc0b1999051a8fec
+Z 66ff94f6273220c1c96ad3fc6404132a
diff --git a/manifest.uuid b/manifest.uuid
index ca8bda57c6..9e9cf3ba83 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c71098409c98af8360f8f28b9238a12ec764018a5782e8ff03fdf5db54031d6e
\ No newline at end of file
+49aa34480622cce4d7a72c59d9cfa8336886387acec8ee15b72f295ea1a52d8c
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index a943078a12..a6b4a551b9 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -6896,7 +6896,7 @@ static int rebuildPage(
 
   assert( i<iEnd );
   j = get2byte(&aData[hdr+5]);
-  if( NEVER(j>(u32)usableSize) ){ j = 0; }
+  if( j>(u32)usableSize ){ j = 0; }
   memcpy(&pTmp[j], &aData[j], usableSize - j);
 
   for(k=0; pCArray->ixNx[k]<=i && ALWAYS(k<NB*2); k++){}
diff --git a/src/main.c b/src/main.c
index 81a76aabce..2262e9aa09 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3824,13 +3824,34 @@ int sqlite3_test_control(int op, ...){
       break;
     }
 
-    /*  sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, unsigned int);
+    /*  sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, int x, sqlite3 *db);
     **
-    ** Use the integer value as the seed for SQLite's internal PRNG.
-    ** rather than the VFS xRandomness() function.
+    ** Control the seed for the pseudo-random number generator (PRNG) that
+    ** is built into SQLite.  Cases:
+    **
+    **    x!=0 && db!=0       Seed the PRNG to the current value of the
+    **                        schema cookie in the main database for db, or
+    **                        x if the schema cookie is zero.  This case
+    **                        is convenient to use with database fuzzers
+    **                        as it allows the fuzzer some control over the
+    **                        the PRNG seed.
+    **
+    **    x!=0 && db==0       Seed the PRNG to the value of x.
+    **
+    **    x==0 && db==0       Revert to default behavior of using the
+    **                        xRandomness method on the primary VFS.
+    **
+    ** This test-control also resets the PRNG so that the new seed will
+    ** be used for the next call to sqlite3_randomness().
     */
     case SQLITE_TESTCTRL_PRNG_SEED: {
-      sqlite3Config.iPrngSeed = va_arg(ap, unsigned int);
+      int x = va_arg(ap, int);
+      int y;
+      sqlite3 *db = va_arg(ap, sqlite3*);
+      assert( db==0 || db->aDb[0].pSchema!=0 );
+      if( db && (y = db->aDb[0].pSchema->schema_cookie)!=0 ){ x = y; }
+      sqlite3Config.iPrngSeed = x;
+      sqlite3_randomness(0,0);
       break;
     }
 
diff --git a/src/os.c b/src/os.c
index 08701028ba..adfa520e25 100644
--- a/src/os.c
+++ b/src/os.c
@@ -260,7 +260,7 @@ void sqlite3OsDlClose(sqlite3_vfs *pVfs, void *pHandle){
 int sqlite3OsRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){
   if( sqlite3Config.iPrngSeed ){
     memset(zBufOut, 0, nByte);
-    if( nByte>sizeof(unsigned) ) nByte = sizeof(unsigned int);
+    if( ALWAYS(nByte>sizeof(unsigned)) ) nByte = sizeof(unsigned int);
     memcpy(zBufOut, &sqlite3Config.iPrngSeed, nByte);
     return SQLITE_OK;
   }else{
diff --git a/src/shell.c.in b/src/shell.c.in
index fa82cf2ad3..366b82b9dc 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -9152,7 +9152,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       { "pending_byte",       SQLITE_TESTCTRL_PENDING_BYTE,  "OFFSET  "           },
       { "prng_restore",       SQLITE_TESTCTRL_PRNG_RESTORE,  ""                   },
       { "prng_save",          SQLITE_TESTCTRL_PRNG_SAVE,     ""                   },
-      { "prng_seed",          SQLITE_TESTCTRL_PRNG_SEED,     "SEED"               },
+      { "prng_seed",          SQLITE_TESTCTRL_PRNG_SEED,     "SEED ?db?"          },
       { "reserve",            SQLITE_TESTCTRL_RESERVE,       "BYTES-OF-RESERVE"   },
     };
     int testctrl = -1;
@@ -9227,7 +9227,6 @@ static int do_meta_command(char *zLine, ShellState *p){
 
         /* sqlite3_test_control(int, uint) */
         case SQLITE_TESTCTRL_PENDING_BYTE:
-        case SQLITE_TESTCTRL_PRNG_SEED:
           if( nArg==3 ){
             unsigned int opt = (unsigned int)integerValue(azArg[2]);
             rc2 = sqlite3_test_control(testctrl, opt);
@@ -9235,6 +9234,23 @@ static int do_meta_command(char *zLine, ShellState *p){
           }
           break;
 
+        /* sqlite3_test_control(int, int, sqlite3*) */
+        case SQLITE_TESTCTRL_PRNG_SEED:
+          if( nArg==3 || nArg==4 ){
+            int i = (int)integerValue(azArg[2]);
+            sqlite3 *db;
+            if( nArg==3 ){
+              db = 0;
+            }else{
+              db = p->db;
+              /* Make sure the schema has been loaded */
+              sqlite3_table_column_metadata(db, 0, "x", 0, 0, 0, 0, 0, 0);
+            }
+            rc2 = sqlite3_test_control(testctrl, i, db);
+            isOk = 3;
+          }
+          break;
+
         /* sqlite3_test_control(int, int) */
         case SQLITE_TESTCTRL_ASSERT:
         case SQLITE_TESTCTRL_ALWAYS:
diff --git a/src/test1.c b/src/test1.c
index 51eb2cc361..808765ec17 100644
--- a/src/test1.c
+++ b/src/test1.c
@@ -6377,9 +6377,19 @@ static int SQLITE_TCLAPI reset_prng_state(
   return TCL_OK;
 }
 /*
-** tclcmd:  prng_seed INT
+** tclcmd:  prng_seed INT ?DB?
 **
-** Establish TEXT as the seed for the PRNG
+** Set up the SQLITE_TESTCTRL_PRNG_SEED pragma with parameter INT and DB.
+** INT is an integer.  DB is a database connection, or a NULL pointer if
+** omitted.
+**
+** When INT!=0 and DB!=0, set the PRNG seed to the value of the schema
+** cookie for DB, or to INT if the schema cookie happens to be zero.
+**
+** When INT!=0 and DB==0, set the PRNG seed to just INT.
+**
+** If INT==0 and DB==0 then use the default procedure of calling the
+** xRandomness method on the default VFS to get the PRNG seed.
 */
 static int SQLITE_TCLAPI prng_seed(
   ClientData clientData, /* Pointer to sqlite3_enable_XXX function */
@@ -6387,14 +6397,17 @@ static int SQLITE_TCLAPI prng_seed(
   int objc,              /* Number of arguments */
   Tcl_Obj *CONST objv[]  /* Command arguments */
 ){
-  unsigned int i;
-  if( objc!=2 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "PRNG-SEED-TEXT");
+  int i = 0;
+  sqlite3 *db = 0;
+  if( objc!=2 && objc!=3 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "SEED ?DB?");
     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);
+  if( objc==3 && getDbPointer(interp, Tcl_GetString(objv[2]), &db) ){
+    return TCL_ERROR;
+  }
+  sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, i, db);
   return TCL_OK;
 }
 
diff --git a/test/dbfuzz2.c b/test/dbfuzz2.c
index 3f3a477387..804222ce4e 100644
--- a/test/dbfuzz2.c
+++ b/test/dbfuzz2.c
@@ -212,8 +212,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *aData, size_t nByte){
     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);
+  sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, 1, db);
 #endif
   for(i=0; i<sizeof(azSql)/sizeof(azSql[0]); i++){
     if( eVerbosity>=1 ){
diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 50079cf499..4d52aedea9 100644
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -1807,8 +1807,7 @@ int main(int argc, char **argv){
           }
 #endif
 #ifdef SQLITE_TESTCTRL_PRNG_SEED
-          sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, 0);
-          sqlite3_randomness(0,0);
+          sqlite3_test_control(SQLITE_TESTCTRL_PRNG_SEED, 1, db);
 #endif
           do{
             runSql(db, (char*)pSql->a, runFlags);