Fix a bug in the custom in-memory VFS used by fuzzcheck. This bug masks

other bugs that should have caused some existing fuzzdata7.db entries to
fail, and so this fix is initially on a branch until those other bugs can
be repaired.

FossilOrigin-Name: e0994e99955cf11f23dba029b5ed7f150f467887558848d5f03510e2fb5855f9

diff --git a/manifest b/manifest
index 1e79d7e3d372e7cb7f3a2bd0875a64e5f19ec13f..7511c4d9cbd95cbd49cd1e10e5c877334553bb6c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sdbtotxt\sdecoder\sin\sthe\sCLI\sso\sthat\sit\signores\sexcess\sbytes.
-D 2018-12-13T22:58:52.532
+C Fix\sa\sbug\sin\sthe\scustom\sin-memory\sVFS\sused\sby\sfuzzcheck.\s\sThis\sbug\smasks\nother\sbugs\sthat\sshould\shave\scaused\ssome\sexisting\sfuzzdata7.db\sentries\sto\nfail,\sand\sso\sthis\sfix\sis\sinitially\son\sa\sbranch\suntil\sthose\sother\sbugs\scan\nbe\srepaired.
+D 2018-12-14T02:29:56.907
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in d8b254f8bb81bab43c340d70d17dc3babab40fcc8a348c8255881f780a45fee6
@@ -974,7 +974,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 fda41c0e4e667fae96b002410bb19cece7a33314264ed6bbc6d012909ee9fd58
+F test/fuzzcheck.c 6edb2a0b6c8113cdac10f8e35b891be1a1b08ebacb1c2e2f93876d4d056e8e15
 F test/fuzzdata1.db 7ee3227bad0e7ccdeb08a9e6822916777073c664
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1787,7 +1787,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1201615cbbd3070158ea5fab3d2c8c95f41b25d6da096a44cb9257a7b7405efc
-R d3f6d72bb77728c78f155f9adb19ef12
+P 18740bd448887d618fafee0b5a7c004aa2f2632244f7d29e2428772baa36b828
+R 4187c96fc309b3296053defbfad74e53
+T *branch * fuzzcheck-fix
+T *sym-fuzzcheck-fix *
+T -sym-trunk *
 U drh
-Z 66d296af7cf5703e86d937cc4fe79584
+Z f01ab5efca756d35503e75880f18321c

diff --git a/manifest.uuid b/manifest.uuid
index cd91c126d42da6979c0740724422096b8750c8c8..4c5ed9e53b842e997e416ac64ab87afa47c3f5b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-18740bd448887d618fafee0b5a7c004aa2f2632244f7d29e2428772baa36b828
\ No newline at end of file
+e0994e99955cf11f23dba029b5ed7f150f467887558848d5f03510e2fb5855f9
\ No newline at end of file

diff --git a/test/fuzzcheck.c b/test/fuzzcheck.c
index 005f59b3d822fdab873bafef8d943b17b2bd1177..0db4167445058973dd45c9b4eb46a011bfa80d93 100644 (file)
--- a/test/fuzzcheck.c
+++ b/test/fuzzcheck.c
@@ -447,7 +447,7 @@ static int inmemRead(
   if( iOfst+iAmt>pVFile->sz ){
     memset(pData, 0, iAmt);
     iAmt = (int)(pVFile->sz - iOfst);
-    memcpy(pData, pVFile->a, iAmt);
+    memcpy(pData, pVFile->a + iOfst, iAmt);
     return SQLITE_IOERR_SHORT_READ;
   }
   memcpy(pData, pVFile->a + iOfst, iAmt);