Improvement to the hexdb interpreter built into the CLI and into the

TCL test harness: Round the "size" up to the next multiple of the "pagesize".

FossilOrigin-Name: 9ec92939cb2d2c96ae15bc496feed233ce31424c25a6bf86ace7e0ef3eedec5b

diff --git a/manifest b/manifest
index 35d331730ae0b9d6db620fc53c701ece3ecc58f8..5db234d5ebd2e3f251a0ee52f84b3aa163e9f002 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\sprocessing\sa\sBETWEEN\sor\sCASE\sexpression,\savoid\stransforming\sa\snode\sof\sthe\soriginal\sexpression\sinto\sa\sTK_REGISTER\snode.\sInstead,\stake\sa\scopy\sand\suse\sit\sinstead.\sFix\sfor\s[1be72aab9].
-D 2019-07-17T14:34:17.365
+C Improvement\sto\sthe\shexdb\sinterpreter\sbuilt\sinto\sthe\sCLI\sand\sinto\sthe\nTCL\stest\sharness:\sRound\sthe\s"size"\sup\sto\sthe\snext\smultiple\sof\sthe\s"pagesize".
+D 2019-07-17T15:05:16.339
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -523,7 +523,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 17d61645b0782809aa2cc68225e93c3ed6a55ca59edcdbf599b5b4a828cec9fb
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c c4b4fe44df6bcf32b693267ae9ec68e1c25f9a29d4a17afebd287d4af2f5fb51
-F src/shell.c.in 360607dce532811befb43946e10697833cadac8f8924aaeab56014c9e93c68a7
+F src/shell.c.in a571d51dd7605b34796e9942dce0e895156d1860383faf6aaca3c88b08fe2a43
 F src/sqlite.h.in 83ebc8ab1a2e82d92214006ea2c15bf8a0604f3fac2c31dd9ce9021f568c71f2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
@@ -532,7 +532,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 f57c229ad7878215d0b3bb5d59ffe94772c099ce5b5e147a4a59d3157923a988
+F src/test1.c 118945bc3c2aabe4528ef2ddb412868e29f5addfb76252b77d441e7b0d67043c
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 405834f6a93ec395cc4c9bb8ecebf7c3d8079e7ca16ae65e82d01afd229694bb
@@ -1837,7 +1837,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 84a51a755c18ac8253080db6eec505df894ee3b1e97cfa8e61039ac38001e270
-R b1d6ad05577abecc48e59e3ebea1a6ed
-U dan
-Z f2c9fb7d68d7563adaf07df958f5d837
+P 7ef7b23cbb1b9ace9f853238d9133320c153e6c3417e6823ab6394ee1fe56358
+R 6e2985f89ff68a775ef455242410e4b1
+U drh
+Z b432616aa5b09e1a9089723afa4c0f9c

diff --git a/manifest.uuid b/manifest.uuid
index 02af7a70e7038adc4d247b3b93a14de1971a1e33..c537def9547e7c46861568fa1c03ba4476b0da88 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ef7b23cbb1b9ace9f853238d9133320c153e6c3417e6823ab6394ee1fe56358
\ No newline at end of file
+9ec92939cb2d2c96ae15bc496feed233ce31424c25a6bf86ace7e0ef3eedec5b
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index c63e9bcd685d66424d224ded2c82b8f8039b6633..b51df8194b90f96ded827a698eba6c8393a93005 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3891,6 +3891,8 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
   rc = sscanf(zLine, "| size %d pagesize %d", &n, &pgsz);
   if( rc!=2 ) goto readHexDb_error;
   if( n<0 ) goto readHexDb_error;
+  if( pgsz<512 || pgsz>65536 || (pgsz&(pgsz-1))!=0 ) goto readHexDb_error;
+  n = (n+pgsz-1)&~(pgsz-1);  /* Round n up to the next multiple of pgsz */
   a = sqlite3_malloc( n ? n : 1 );
   if( a==0 ){
     utf8_printf(stderr, "Out of memory!\n");

diff --git a/src/test1.c b/src/test1.c
index 9aaf79261e0fb657a96527fe08b6b2a40b06fc17..02a7aad9face06fdee7b3ee51560e803dccab043 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -7740,6 +7740,11 @@ static int SQLITE_TCLAPI test_decode_hexdb(
       int pgsz;
       rc = sscanf(zIn+i, "| size %d pagesize %d", &n, &pgsz);
       if( rc!=2 ) continue;
+      if( pgsz<512 || pgsz>65536 || (pgsz&(pgsz-1))!=0 ){
+        Tcl_AppendResult(interp, "bad 'pagesize' field", (void*)0);
+        return TCL_ERROR;
+      }
+      n = (n+pgsz-1)&~(pgsz-1);  /* Round n up to the next multiple of pgsz */
       if( n<512 ){
         Tcl_AppendResult(interp, "bad 'size' field", (void*)0);
         return TCL_ERROR;