From: drh <> Date: Mon, 25 Oct 2021 18:51:56 +0000 (+0000) Subject: Remove a NEVER() in rebuildPage that is reachable, as is demonstrated by X-Git-Tag: version-3.37.0~96 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b35c679a9c534631cb002b6850f72f26a5d45f2;p=thirdparty%2Fsqlite.git Remove a NEVER() in rebuildPage that is reachable, as is demonstrated by dbsqlfuzz case beac09b2756b5d285aa68f9737fdb06c972f159a. FossilOrigin-Name: ac3f617827e06800d26ef688c5f5480b9621676f141d2eac134f877e0c454149 --- diff --git a/manifest b/manifest index a581a6ff99..545b6fa316 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\sallow\slarge\sbusy_timeout\spragmas\sin\sfuzzcheck,\sas\sthey\saccomplish\nnothing\sother\sthan\smaking\sthe\stests\sunnecessarily\sslow. -D 2021-10-25T12:54:23.541 +C Remove\sa\sNEVER()\sin\srebuildPage\sthat\sis\sreachable,\sas\sis\sdemonstrated\sby\ndbsqlfuzz\scase\sbeac09b2756b5d285aa68f9737fdb06c972f159a. +D 2021-10-25T18:51:56.300 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -490,7 +490,7 @@ F src/auth.c f4fa91b6a90bbc8e0d0f738aa284551739c9543a367071f55574681e0f24f8cf F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d F src/bitvec.c 7c849aac407230278445cb069bebc5f89bf2ddd87c5ed9459b070a9175707b3d F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 -F src/btree.c 0604f4af97624ffbe2f0757c559c51f57760c6ad3d8ee3ee94fa6ec5795f2832 +F src/btree.c 004c647dfb5332ee4b56385f3ac264ebea781cb00f7a1561a48f4a45b78fed61 F src/btree.h 74d64b8f28cfa4a894d14d4ed64fa432cd697b98b61708d4351482ae15913e22 F src/btreeInt.h ee9348c4cb9077243b049edc93a82c1f32ca48baeabf2140d41362b9f9139ff7 F src/build.c 8bdda90f9b1189c7b0813575171b3c6b2d74b3ade57c11cb4383776781ea9335 @@ -1929,7 +1929,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 87d49e80878674470d280de79c8ade222dd006e65c90e79616c4f72c7c32dabb -R bc4bb1c85a5699919f19901db43f7f5f +P fba441bf9f6ed729a66ccd4e42b5a8859bf3952d70a66bc9a2496ec49d90a60c +R b046afa0c3d079723fde3f7c27c80f0b U drh -Z 82f19ae953cfc65c5ff84d970cd775e3 +Z 7cee34f3c763c52a086ac43f9a7fefb9 diff --git a/manifest.uuid b/manifest.uuid index 488b1da4a1..9772a0f585 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fba441bf9f6ed729a66ccd4e42b5a8859bf3952d70a66bc9a2496ec49d90a60c \ No newline at end of file +ac3f617827e06800d26ef688c5f5480b9621676f141d2eac134f877e0c454149 \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index ccb7eac1a7..0d220a3b93 100644 --- a/src/btree.c +++ b/src/btree.c @@ -7084,7 +7084,7 @@ static int rebuildPage( assert( i(u32)usableSize) ){ j = 0; } + if( j>(u32)usableSize ){ j = 0; } memcpy(&pTmp[j], &aData[j], usableSize - j); for(k=0; pCArray->ixNx[k]<=i && ALWAYS(k