From: drh <> Date: Wed, 20 May 2026 11:53:15 +0000 (+0000) Subject: Check-in [7cf841f3613c8302] was incomplete in that it did not remove X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=ccf23dadea7671c5a3cfa5e8f15e6aef45b40d54;p=thirdparty%2Fsqlite.git Check-in [7cf841f3613c8302] was incomplete in that it did not remove the incorrect assert() statement. Fixed here. FossilOrigin-Name: c19bacca13f699953bbf50afb867035a94080b8a48111cf3d87bced880a3e620 --- diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 78d561a956..c0320cecab 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -1664,7 +1664,6 @@ static int rtreeStepToLeaf(RtreeCursor *pCur){ pNode = rtreeNodeOfFirstSearchPoint(pCur, &rc); if( rc ) return rc; nCell = NCELL(pNode); - assert( nCell<200 ); if( nCell>RTREE_MAXCELLS ){ RTREE_IS_CORRUPT(pRtree); return SQLITE_CORRUPT_VTAB; diff --git a/manifest b/manifest index bf6a2cdb4f..265f372fda 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\sreturning\san\sSQLITE_SCHEMA\serror\sfrom\swithin\ssqlite3session_diff()\sif\sthe\sschema\shas\sbeen\srecently\smodified.\sFirst\sreported\shere. -D 2026-05-20T11:41:24.177 +C Check-in\s[7cf841f3613c8302]\swas\sincomplete\sin\sthat\sit\sdid\snot\sremove\nthe\sincorrect\sassert()\sstatement.\s\sFixed\shere. +D 2026-05-20T11:53:15.865 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -493,7 +493,7 @@ F ext/recover/sqlite3recover.h 011c799f02deb70ab685916f6f538e6bb32c4e0025e79bfd0 F ext/recover/test_recover.c 3d0fb1df7823f5bc22a0b93955034d16a2dfa2eb1e443e9a0123a77f120599a3 F ext/rtree/README 734aa36238bcd2dee91db5dba107d5fcbdb02396612811377a8ad50f1272b1c1 F ext/rtree/geopoly.c bd1971479184d559499ff3087c37f2823977d7b0ec80916141ae66f70345c88d -F ext/rtree/rtree.c 9e8ed7e43df2b88a04343d37038c4433b8f4c13618f2ab1293e671f5364f264d +F ext/rtree/rtree.c acc098e82686fa278c20973d601b4c2489389f5d580d42efe0f799d2cf8cdf38 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412 F ext/rtree/rtree1.test e0608db762b2aadca0ecb6f97396cf66244490adc3ba88f2a292b27be3e1da3e F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d @@ -2205,8 +2205,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 6aaeeffc2c7abbe32050da40bcbffc5f8d596e6df4603b8f8f23294f2465f25e -R 90950d952f13b0684bf911f42ae30e07 -U dan -Z 74c0c05c18bae6e136b01b22e5b23cff +P 20110547a117912be68d91bc006e92c45beffde16c6bcdf062bf8971c9a9a864 +R 67509f4148b02e5461ab558080d99e3d +U drh +Z b786c3ef36d59ec3f899e528c54a2488 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1e561e9b39..b2ed558e85 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -20110547a117912be68d91bc006e92c45beffde16c6bcdf062bf8971c9a9a864 +c19bacca13f699953bbf50afb867035a94080b8a48111cf3d87bced880a3e620