The sqlite3_blob_close() interface can cause recursive invocations of

nodeBlobReset() in RTREE.  Make sure that does not cause problems.

FossilOrigin-Name: 88333441cbf26bfde2acebf2a3f75b5ebbdfb0ae

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 92ddcf526eba15ee49d12ce45789ca98bdc282c9..c5998d2548292963c1ce410f47892d413fcc2a91 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -625,8 +625,9 @@ static RtreeNode *nodeNew(Rtree *pRtree, RtreeNode *pParent){
 */
 static void nodeBlobReset(Rtree *pRtree){
   if( pRtree->pNodeBlob && pRtree->inWrTrans==0 && pRtree->nCursor==0 ){
-    sqlite3_blob_close(pRtree->pNodeBlob);
+    sqlite3_blob *pBlob = pRtree->pNodeBlob;
     pRtree->pNodeBlob = 0;
+    sqlite3_blob_close(pBlob);
   }
 }
 

diff --git a/manifest b/manifest
index 5b06a60ca8691d1acbfc6f96c8f88032cd07896b..f8a355c0e74f2b60811655c54e4cc71b0aec378a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sRTREE\sso\sthat\sthe\ssqlite3_blob\sobject\sis\sclosed\swhenever\sthe\scursor\ncount\sdrops\sto\szero\sand\sthere\sis\snot\sa\spending\swrite\stransaction.
-D 2017-02-02T14:40:06.876
+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
 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 df33d86df608a16516a95c6d184a5ed9988d2bc9
+F ext/rtree/rtree.c 93fd417d6f566caa49a548c915a27125a1b405c3
 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 fc4917d730b29b0bf60fea5e0166728635783e9c
-R 0b53bd94b2e2abfad755fb806046ae11
+P 9bb4eafe1a60176ed2e731bb7e3067c0b8a46615
+R 6cebe0517919da4320850125e35977ce
 U drh
-Z 9c59d9d407f6159f87ae8b113cdc33c2
+Z 7ae516135e0fc0897102b9fc210a106c

diff --git a/manifest.uuid b/manifest.uuid
index 0b51f62de37d7636ba88187a2fb8de583ac88356..ee09db23ccaa912819c17774988bc7f4ebf4304d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9bb4eafe1a60176ed2e731bb7e3067c0b8a46615
\ No newline at end of file
+88333441cbf26bfde2acebf2a3f75b5ebbdfb0ae
\ No newline at end of file