From 7bc6a818f0246ecd3748dc896872b3cfa94a62f9 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 30 Sep 2022 22:40:57 +0000 Subject: [PATCH] Remove one of the NEVER() macros added by [5166acf3f0040459] because it is reachable after all. FossilOrigin-Name: bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/btree.c | 2 +- test/fuzzdata8.db | Bin 3293184 -> 3298304 bytes 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index cbdfaad8cb..29aa8d8ae2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C New\stest\scases\sin\sfuzzdata8.db -D 2022-09-30T20:59:09.967 +C Remove\sone\sof\sthe\sNEVER()\smacros\sadded\sby\s[5166acf3f0040459]\sbecause\sit\nis\sreachable\safter\sall. +D 2022-09-30T22:40:57.814 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -528,7 +528,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf F src/backup.c a2891172438e385fdbe97c11c9745676bec54f518d4447090af97189fd8e52d7 F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d F src/btmutex.c 6ffb0a22c19e2f9110be0964d0731d2ef1c67b5f7fabfbaeb7b9dabc4b7740ca -F src/btree.c 9c1aa101325abca2e7f1e5c24eee990cead2183d0b793db1199d4a57b0be6315 +F src/btree.c ef9c126d6dc5dff8ff76abc807dfef5b8aac42144e3be11cbcd9cb6eaecef580 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h 8ce1332edd89dfd2461d561ac10a0ab5601c8e06200cb5230596c3caaf54482e F src/build.c 898884afd67d953808cb687babc15b66a10213f99fe2ce7db98960e959881f98 @@ -1112,7 +1112,7 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2 -F test/fuzzdata8.db 652953c44494e176b9cbf8e37eb020e69fdd2395114fb1554377be328c08ff0e +F test/fuzzdata8.db 653423800b7671e67caa740e977d80e1360f0d69e9992851f3ea5c4a69a2724a F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14 F test/fuzzerfault.test f64c4aef4c9e9edf1d6dc0d3f1e65dcc81e67c996403c88d14f09b74807a42bc @@ -2000,8 +2000,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7e761a02530ffbb055a766eb6c995f11fc2adbabb9a52502124f672fdcff0d10 -R 2ed590521c06c3e3aa9ca21e94c7fcbe +P aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 +R a1d3c0131d04144023f8eda3431f858a U drh -Z f5898bf6ec0ce9d69f912d0173ce9ebb +Z 6c2a7fe31c25c65cdf8db45166d1307a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8438e6741c..522f0d3435 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -aa367a3c974041323edb759855f0b83803439ceef2846da2d73eadd80efeaac4 \ No newline at end of file +bd8ae5febbb8d3122f1e2e09b9fcdd6ac20c075ae1cf60bcdbd36080f3736417 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index e1696b9bfb..c54fd2e7c8 100644 --- a/src/btree.c +++ b/src/btree.c @@ -4954,7 +4954,7 @@ static int accessPayload( assert( pPage ); assert( eOp==0 || eOp==1 ); assert( pCur->eState==CURSOR_VALID ); - if( NEVER(pCur->ix>=pPage->nCell) ){ + if( pCur->ix>=pPage->nCell ){ return SQLITE_CORRUPT_PAGE(pPage); } assert( cursorHoldsMutex(pCur) ); diff --git a/test/fuzzdata8.db b/test/fuzzdata8.db index 7e8649c3266a62e60c94cafbc1a9ac181ac37a87..aff7e27340cd560731ada86f167851c766694516 100644 GIT binary patch delta 6621 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 delta 5950 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