Use SQLITE_WITHIN() for pointer range comparisons in some testing code.

FossilOrigin-Name: 7cacf4e954c8de5af5efb56d8271a5ac1edc1c04

diff --git a/manifest b/manifest
index 22ecbfaa94e31b52411fcb042f3fea1aad6ebe71..5a24a606e76989e9dd57df43e23e1961bcbdf82c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sallow\spointer\sarithmetic\sto\smove\sa\spointer\sacross\sa\smemory\sallocation\nboundary.
-D 2016-04-05T13:19:19.622
+C Use\sSQLITE_WITHIN()\sfor\spointer\srange\scomparisons\sin\ssome\stesting\scode.
+D 2016-04-05T13:35:43.174
 F Makefile.in e812bb732d7af01baa09f1278bd4f4a2e3a09449
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc fe57d7e3e74fa383fd01ced796c0ffd966fc094a
@@ -319,7 +319,7 @@ F src/auth.c b56c78ebe40a2110fd361379f7e8162d23f92240
 F src/backup.c f60f0aa55d25d853ffde53d0b0370a7bb7ee41ce
 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
-F src/btree.c 2b5504ac632a0d7a1cac94eacee3042f1d79de38
+F src/btree.c 556203aab543e91f4e20cc273a507ed712c8da26
 F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9
 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 F src/build.c 39faaaeecb77eb3936d4bd5024e865e3836ca323
@@ -1482,7 +1482,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 d5fc2f7f90f8cbd53810c7a445b0e9c9a0e39182
-R 1653d2df23c45643b8fad503f203cef3
+P 85b979319bcb8ec301ae39b36ad60348e4515be7
+R 78bf202733e4247e84509df93eee1af7
 U drh
-Z 587fa086f1daad23618d760100c57f67
+Z b9b3193def70d2175e83a878eda9a91d

diff --git a/manifest.uuid b/manifest.uuid
index 88c7d9f709d8c51dab1c1e36dcdf6934b0496b3b..b976ec3fb2089b407c71e4e644463ef0e444cf18 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-85b979319bcb8ec301ae39b36ad60348e4515be7
\ No newline at end of file
+7cacf4e954c8de5af5efb56d8271a5ac1edc1c04
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 079fd0b9e432ee628ea2b7038b6cc6b9340a4b9d..e5be8e0ef8159d3c5d232149b852a9142e262b53 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -6708,7 +6708,7 @@ static int editPage(
   for(i=0; i<nNew && !CORRUPT_DB; i++){
     u8 *pCell = pCArray->apCell[i+iNew];
     int iOff = get2byteAligned(&pPg->aCellIdx[i*2]);
-    if( pCell>=aData && pCell<&aData[pPg->pBt->usableSize] ){
+    if( SQLITE_WITHIN(pCell, aData, &aData[pPg->pBt->usableSize]) ){
       pCell = &pTmp[pCell - aData];
     }
     assert( 0==memcmp(pCell, &aData[iOff],