Change a memcpy() into a memmove() to prevent a warning about overlapping

regions passed to memcpy() in case of some obscure and unlikely database
corruption.

FossilOrigin-Name: bab132cbd18a529389a0315e60f30ccf1b565823116e0ec9b4f7684db1914c80

diff --git a/manifest b/manifest
index 56e9b22191a8e0b09b21b7a317b544657af1c963..ee5bf7326e5eab6f5d1cd595c4c67237de3c160b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarnings\sof\sunused\sfunction\sparameters\sin\sFTS5.
-D 2021-04-22T19:34:31.184
+C Change\sa\smemcpy()\sinto\sa\smemmove()\sto\sprevent\sa\swarning\sabout\soverlapping\nregions\spassed\sto\smemcpy()\sin\scase\sof\ssome\sobscure\sand\sunlikely\sdatabase\ncorruption.
+D 2021-04-22T20:01:02.989
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c c747dca6b20dbc6f4de8aad99ac6deae153a099af95718de366c602bb9121a63
+F src/btree.c 054bd037a6b759eb5d6af7916df8226972f6a852514aee8110022ddac10aaf7f
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c 45889a1ac425eb7d60113ce65a519c55c5d5d01f2a9e978ab1467f8653bb57eb
@@ -1914,7 +1914,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 553ada28f356d773c145b502163d766285e73fd4f64dc05f98e3e43ade806331
-R dbd6c4917cb3459c326bcc5cc7cbb278
+P 14273915979f8fbf80111e795b5511a6ee24638896b9d434d6ccf4bf7f7a7f62
+R c9ee6b07c5b3bb7ab60fe0fd462562c3
 U drh
-Z b5984b3e4e7f3be1661b64c450fae240
+Z 41223c7313ced80558031a39a6e27102

diff --git a/manifest.uuid b/manifest.uuid
index 5405487829c5d9ffa54764873e14f103a858ee33..722d61088c2e6c20299981b72352d71cdcc25d28 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14273915979f8fbf80111e795b5511a6ee24638896b9d434d6ccf4bf7f7a7f62
\ No newline at end of file
+bab132cbd18a529389a0315e60f30ccf1b565823116e0ec9b4f7684db1914c80
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 7ff0a46e1eb359f0eaf556a3c014cd99938b8b91..d3c76cde93f1ce3de7c57400f98b5c6cd9edfff9 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -7028,7 +7028,7 @@ static int rebuildPage(
     put2byte(pCellptr, (pData - aData));
     pCellptr += 2;
     if( pData < pCellptr ) return SQLITE_CORRUPT_BKPT;
-    memcpy(pData, pCell, sz);
+    memmove(pData, pCell, sz);
     assert( sz==pPg->xCellSize(pPg, pCell) || CORRUPT_DB );
     i++;
     if( i>=iEnd ) break;