database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

Detect OOM earlier in the geopoly extension.

Browse Source 
dbsqlfuzz 0986e7b020e6137fc6b96331f91d15753d18e42d.

FossilOrigin-Name: 7237117595a3519717a0a4b03eb427c6ec55b214e7ecd6d0f63a613adec355d4
This commit is contained in:
drh
2021-04-06 22:56:28 +00:00
parent cc26301ec3
commit a74364ae13
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/rtree/geopoly.c
View File

@ -310,6 +310,10 @@ static GeoPoly *geopolyFuncParam(
){
const unsigned char *a = sqlite3_value_blob(pVal);
int nVertex;
if( a==0 ){
sqlite3_result_error_nomem(pCtx);
return 0;
}
nVertex = (a[1]<<16) + (a[2]<<8) + a[3];
if( (a[0]==0 || a[0]==1)
&& (nVertex*2*sizeof(GeoCoord) + 4)==(unsigned int)nByte

14
manifest
View File

@ -1,5 +1,5 @@
C Modify\sthe\sdrop\scolumn\scode\sto\shandle\sWITHOUT\sROWID\stables\sfor\swhich\sa\ssingle\scolumn\sappears\smore\sthan\sonce\sin\sthe\sprimary\skey.
D 2021-04-06T21:20:39.072
C Detect\sOOM\searlier\sin\sthe\sgeopoly\sextension.\ndbsqlfuzz\s0986e7b020e6137fc6b96331f91d15753d18e42d.
D 2021-04-06T22:56:28.037
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 d35b73dddcbc6f3f81879f95875770b553a1021216fa4a04f77b9c49bce21a46
F ext/rtree/geopoly.c 98d45533989e908bf65b43f36ff6eaad95a9ffe6f3b6b8658fbd47d45c58b10b
F ext/rtree/rtree.c 60f6f1675134201974be4189dbd219494c13e1ed30e80bd92ae0dcc86df1b035
F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e
@ -1912,7 +1912,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 887c19a15ba60a5dc375dda7e289d476ba24d4adb38086a013df9709b88f32a7
R 83038b920e6d418d2a4a2058a89a8d4f
U dan
Z 2293d8c2e3c5f4a9a58f9cff85d615f1
P e0d2507021c5a04016c442f954b542c0920678737ae7c710eb8ac50d6337db1c
R 8e22765d617b37795065f29288782bda
U drh
Z f0608b0a883e3922f028c84658d3ba0c

2
manifest.uuid
View File

@ -1 +1 @@
e0d2507021c5a04016c442f954b542c0920678737ae7c710eb8ac50d6337db1c
7237117595a3519717a0a4b03eb427c6ec55b214e7ecd6d0f63a613adec355d4