From: drh <> Date: Fri, 2 Apr 2021 18:59:13 +0000 (+0000) Subject: Fix a problem with the geopoly_bbox() function. X-Git-Tag: version-3.36.0~274 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec435c40ed847ee806aacaba59909256d969ac7b;p=thirdparty%2Fsqlite.git Fix a problem with the geopoly_bbox() function. FossilOrigin-Name: f3a2eb979f1003e8249e613b34afd345f157c0d54b4f05ea0db230ef70e71351 --- diff --git a/ext/rtree/geopoly.c b/ext/rtree/geopoly.c index b1cff38edf..f88f51d269 100644 --- a/ext/rtree/geopoly.c +++ b/ext/rtree/geopoly.c @@ -683,7 +683,7 @@ static GeoPoly *geopolyBBox( aCoord[2].f = mnY; aCoord[3].f = mxY; } - }else{ + }else if( aCoord ){ memset(aCoord, 0, sizeof(RtreeCoord)*4); } return pOut; diff --git a/manifest b/manifest index a0048bbcbe..eb22676dbf 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C When\sresolving\snames\sin\sthe\sRETURNING\sclause,\sdo\snot\saccept\strigger\snames\neven\swithin\ssubquires.\s\sSee\n[forum:/info/34c81d83c9177f46|forum\spost\s34c81d83c9177f46]\sfor\scontext. -D 2021-03-31T23:56:55.122 +C Fix\sa\sproblem\swith\sthe\sgeopoly_bbox()\sfunction. +D 2021-04-02T18:59:13.666 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -392,7 +392,7 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782 F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c335096108c12c01bddbadcec F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/geopoly.c 1b1ddecb79877b12331d35de9f393b80bbb731e0bf6db6c572f23191987ea803 +F ext/rtree/geopoly.c d35b73dddcbc6f3f81879f95875770b553a1021216fa4a04f77b9c49bce21a46 F ext/rtree/rtree.c 60f6f1675134201974be4189dbd219494c13e1ed30e80bd92ae0dcc86df1b035 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412 F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e @@ -1911,7 +1911,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 51d5c50b2fb373e4c7ddb7e26657c26ad39dc9c2fc629bba5c2522b4150d8fac -R 3a741475768035cf21a3bbabb91b90d2 +P fd4ea3f626b6e4957d56c2369be711895735cfc37cfde65650a6682ad5a3eb1a +R 6950494a507d409a31ba9db8450c7ab5 U drh -Z c512d8a314e5bf5beb44a97f116f574c +Z 19246c5f3c2f1a430773bc8dc29b5ece diff --git a/manifest.uuid b/manifest.uuid index 2576359b5d..81c794e664 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fd4ea3f626b6e4957d56c2369be711895735cfc37cfde65650a6682ad5a3eb1a \ No newline at end of file +f3a2eb979f1003e8249e613b34afd345f157c0d54b4f05ea0db230ef70e71351 \ No newline at end of file