mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a potential uninitialized (though harmless) variable in RTREE.

Browse Source 
FossilOrigin-Name: a1c74e09d63aca630d022ed074866433eed6b493
This commit is contained in:
drh 2017-02-02 16:08:27 +00:00
parent 413e207e31
commit ce655a2367
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/rtree/rtree.c
View File

@ -1118,7 +1118,6 @@ static int rtreeCallbackConstraint(
sqlite3_rtree_dbl *prScore, /* OUT: score for the cell */
int *peWithin /* OUT: visibility of the cell */
){
int i; /* Loop counter */
sqlite3_rtree_query_info *pInfo = pConstraint->pInfo; /* Callback info */
int nCoord = pInfo->nCoord; /* No. of coordinates */
int rc; /* Callback return code */
@ -1163,9 +1162,10 @@ static int rtreeCallbackConstraint(
}
}
if( pConstraint->op==RTREE_MATCH ){
int eWithin = 0;
rc = pConstraint->u.xGeom((sqlite3_rtree_geometry*)pInfo,
nCoord, aCoord, &i);
if( i==0 ) *peWithin = NOT_WITHIN;
nCoord, aCoord, &eWithin);
if( eWithin==0 ) *peWithin = NOT_WITHIN;
*prScore = RTREE_ZERO;
}else{
pInfo->aCoord = aCoord;

12
manifest
View File

@ -1,5 +1,5 @@
C The\ssqlite3_blob_close()\sinterface\scan\scause\srecursive\sinvocations\sof\nnodeBlobReset()\sin\sRTREE.\s\sMake\ssure\sthat\sdoes\snot\scause\sproblems.
D 2017-02-02T15:35:54.700
C Fix\sa\spotential\suninitialized\s(though\sharmless)\svariable\sin\sRTREE.
D 2017-02-02T16:08:27.041
F Makefile.in 5f415e7867296d678fed2e6779aea10c1318b4bc
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc ba953c8921fc7e18333f61898007206de7e23964
@ -264,7 +264,7 @@ F ext/rbu/sqlite3rbu.c bb0de6cdbdb14a7d55a097238a434b7e99caf318
F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba
F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88
F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
F ext/rtree/rtree.c 93fd417d6f566caa49a548c915a27125a1b405c3
F ext/rtree/rtree.c e1b77d0f32241f3c09ab0bc7cf7be5d263902978
F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec
F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@ -1552,7 +1552,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 9bb4eafe1a60176ed2e731bb7e3067c0b8a46615
R 6cebe0517919da4320850125e35977ce
P 88333441cbf26bfde2acebf2a3f75b5ebbdfb0ae
R 6c083917a4ecdc09328902e3d7d74ce0
U drh
Z 7ae516135e0fc0897102b9fc210a106c
Z 3e4bf024e32b2f321d57a48b2d7cd9ed

2
manifest.uuid
View File

@ -1 +1 @@
88333441cbf26bfde2acebf2a3f75b5ebbdfb0ae
a1c74e09d63aca630d022ed074866433eed6b493