From: drh Date: Tue, 22 Mar 2016 15:25:16 +0000 (+0000) Subject: Fix a harmless compiler warning. X-Git-Tag: version-3.12.0~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5e7f94494a27bc13b5f62584101166e91ebdcf4;p=thirdparty%2Fsqlite.git Fix a harmless compiler warning. FossilOrigin-Name: 5ace870d3ac3e9eb29cb4602c9036873adbcb99d --- diff --git a/manifest b/manifest index 358587aaa3..1fb0bc726f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\ssome\serrors\sin\sfts5\stest\sscripts. -D 2016-03-22T15:01:54.312 +C Fix\sa\sharmless\scompiler\swarning. +D 2016-03-22T15:25:16.949 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66 @@ -297,7 +297,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 8a02b1fb98eb11b9ce50cb3ab6a031f852b69303 +F src/btree.c 577fb5674e2f0aa0a38246afc19e1885a0b8c9b0 F src/btree.h a5008b9afe56e8e54ade6c436a910f112defcca9 F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 F src/build.c 213cbf84e99dd834e6ea46615633656d7ef79321 @@ -1459,7 +1459,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 2484cc0c3ffc8834a155f89af1581bd07d453a90 -R ab98ce57ff7e19fbcedd913d7355f5be -U dan -Z e1d6ab80a5a2193f9db22bd77af06553 +P e1ab2d376a72786098125a41c1ea8140fcbd15c6 +R bdaff546f18a9832fa859fa7ed0eb2c5 +U drh +Z e5f40ebb5a86d8be765f1d7f6d3191da diff --git a/manifest.uuid b/manifest.uuid index 43213d63e1..a62797cd9e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e1ab2d376a72786098125a41c1ea8140fcbd15c6 \ No newline at end of file +5ace870d3ac3e9eb29cb4602c9036873adbcb99d \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 1a82176f18..bf99597095 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4473,7 +4473,7 @@ static int accessPayload( assert( offset+amt <= pCur->info.nPayload ); assert( aPayload > pPage->aData ); - if( (aPayload - pPage->aData) > (pBt->usableSize - pCur->info.nLocal) ){ + if( (uptr)(aPayload - pPage->aData) > (pBt->usableSize - pCur->info.nLocal) ){ /* Trying to read or write past the end of the data is an error. The ** conditional above is really: ** &aPayload[pCur->info.nLocal] > &pPage->aData[pBt->usableSize]