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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 NZFPgCLe;VM{{VMg=q3OF delta 5950 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 -- 2.47.3