From: drh Date: Fri, 12 Jun 2020 00:31:52 +0000 (+0000) Subject: Remove a NEVER() that turns out to be reachable. X-Git-Tag: version-3.33.0~129 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6aa7515c46f03f5e42843864cf732fbe0a0b284d;p=thirdparty%2Fsqlite.git Remove a NEVER() that turns out to be reachable. FossilOrigin-Name: 44e573ecd5c2b60107133d60c51f3a04a3f904e9c1cf926e9b8ea977c7acae8d --- diff --git a/manifest b/manifest index 4f90c0b7d1..55bfba8acb 100644 --- a/manifest +++ b/manifest @@ -1,13 +1,15 @@ B fd5abb1a7b5a55127d5c0d5ff448020d8bccab44e4f5afe1eb88fc19578af735 -C Add\sa\snew\sassert()\sto\sthe\sSELECT\sprocessing. -D 2020-06-11T16:04:10.746 +C Remove\sa\sNEVER()\sthat\sturns\sout\sto\sbe\sreachable. +D 2020-06-12T00:31:52.711 +F src/btree.c fabc215bd1ebab0e48108e95e0f50531da9883156b95888f479f6c696db032ad F src/global.c 0409ae635839e0bef26a69b68be64126ab6cba62ac19bd7694f1652e591c4c17 F src/select.c 929e1c0db3cb3d9f7d2304c6596868abcb6dfd7c2a0ac1bdf12a5a4432078ba4 F src/sqliteInt.h fe320867c4f48eeeca523062c5668508b3f9b88d65690d42610bd138a5fdb5c4 F src/test1.c e9f68f157f8fd027ee4c32c4b427f4eed274749bfb745427e2d954fa89d95ad3 F src/window.c 88a63e6948ea924b3cf9ad8aff5ea1fa53bebdb2f13340867205fda16ed0f19c +F test/fuzzdata8.db 9ce2e5f0d7e5e61d5f8f0817346b2a3db2aeebbaff20d04043521623ea0558be F test/window1.test 9d7f4990e5b36d95af93b189da4aa75216c6690ce95cced3c8b6d3234be51c2c -P 32a88bdd4be5acdc1b80856bf6e32724dc3a467d5050bec0fe1a3dfedcc06f34 -R 2b3df40625e1e1ca91eabc824248dfbb +P 98cea4a32ba558c137d71a5e373a6803d764d34c5640907371dcf6468ffb2e64 +R fe941a98130365dcc5664681cdfda93a U drh -Z 5781754b9c0a637aa77d00f970b7b71b +Z a269c334c0d41dc18dbae6d92c570372 diff --git a/manifest.uuid b/manifest.uuid index 73df9f885f..8e39176095 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -98cea4a32ba558c137d71a5e373a6803d764d34c5640907371dcf6468ffb2e64 \ No newline at end of file +44e573ecd5c2b60107133d60c51f3a04a3f904e9c1cf926e9b8ea977c7acae8d \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index f269b3deee..6ec97f2edd 100644 --- a/src/btree.c +++ b/src/btree.c @@ -1751,7 +1751,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){ nFrag = iFreeBlk - iEnd; if( iEnd>iFreeBlk ) return SQLITE_CORRUPT_PAGE(pPage); iEnd = iFreeBlk + get2byte(&data[iFreeBlk+2]); - if( NEVER(iEnd > pPage->pBt->usableSize) ){ + if( iEnd > pPage->pBt->usableSize ){ return SQLITE_CORRUPT_PAGE(pPage); } iSize = iEnd - iStart; diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index b183746029..b943b2a99c 100644 Binary files a/test/fuzzdata8.db and b/test/fuzzdata8.db differ