Fix the dbtotxt decoder in the CLI so that it ignores excess bytes.

FossilOrigin-Name: 18740bd448887d618fafee0b5a7c004aa2f2632244f7d29e2428772baa36b828

diff --git a/manifest b/manifest
index fde77760b456c7eb275f8170596821b1557abe31..1e79d7e3d372e7cb7f3a2bd0875a64e5f19ec13f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C dbfuzz2\sfound\sa\sNEVER()\sthat\sis\ssometimes\strue.
-D 2018-12-13T21:52:18.133
+C Fix\sthe\sdbtotxt\sdecoder\sin\sthe\sCLI\sso\sthat\sit\signores\sexcess\sbytes.
+D 2018-12-13T22:58:52.532
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@ -508,7 +508,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c abd65c518c198400193c6319a70c0d722fa30a35be89dc898917ff6489edf017
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 8c7317d5ee920516a56b8b4ca79fbfca70a1f8b52d67e884c808ea3a016c04e3
-F src/shell.c.in a9b26ab3925e179f4f1a3a910ffe634195bc6becab8aa3e02bbb0dc652d30543
+F src/shell.c.in e1790e0d3607fca70ce61e5a0c83885d82f33ebe362edfb1cb66342d12c182d0
 F src/sqlite.h.in 92fd656c26cc76de9fa8c5bf1a473066e3b5c6da345a447679f0f44de1aa4edd
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 960f1b86c3610fa23cb6a267572a97dcf286e77aa0dd3b9b23292ffaa1ea8683
@@ -1787,7 +1787,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 997b65117f8c12dba5fb85434fde9765cdb0d2a49cc3e31979abba3e21350086
-R af29ae4514bf6c6037181584412356da
+P 1201615cbbd3070158ea5fab3d2c8c95f41b25d6da096a44cb9257a7b7405efc
+R d3f6d72bb77728c78f155f9adb19ef12
 U drh
-Z 9494dddc6a7ba7c94e12f1de4eb883b6
+Z 66d296af7cf5703e86d937cc4fe79584

diff --git a/manifest.uuid b/manifest.uuid
index 230bcc072dd640db95d3cc46e31e1d6edcf26335..cd91c126d42da6979c0740724422096b8750c8c8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1201615cbbd3070158ea5fab3d2c8c95f41b25d6da096a44cb9257a7b7405efc
\ No newline at end of file
+18740bd448887d618fafee0b5a7c004aa2f2632244f7d29e2428772baa36b828
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 1c06c675662ae1afaed29ee2c599453eb3b0d558..6bb8ee7fdcef9bdfad53ef9d65c303b7b8d960a5 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3786,11 +3786,9 @@ static unsigned char *readHexDb(ShellState *p, int *pnData){
                 &x[8], &x[9], &x[10], &x[11], &x[12], &x[13], &x[14], &x[15]);
     if( rc==17 ){
       k = iOffset+j;
-      if( k+16>n ){
-        utf8_printf(stderr, "continue exceeds file size\n");
-        goto readHexDb_error;
+      if( k+16<=n ){
+        memcpy(a+k, x, 16);
       }
-      memcpy(a+k, x, 16);
     }
   }
   *pnData = n;