diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index b39e5801b2..c4c536f8ce 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -1721,15 +1721,17 @@ static int rtreeFilter( int ii; int rc = SQLITE_OK; int iCell = 0; + sqlite3_stmt *pStmt; rtreeReference(pRtree); /* Reset the cursor to the same state as rtreeOpen() leaves it in. */ freeCursorConstraints(pCsr); sqlite3_free(pCsr->aPoint); - sqlite3_finalize(pCsr->pReadAux); + pStmt = pCsr->pReadAux; memset(pCsr, 0, sizeof(RtreeCursor)); pCsr->base.pVtab = (sqlite3_vtab*)pRtree; + pCsr->pReadAux = pStmt; pCsr->iStrategy = idxNum; if( idxNum==1 ){ diff --git a/manifest b/manifest index f963313acd..bf8c2873b8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sprepare-statement\sleak. -D 2018-05-18T16:46:09.315 +C Avoid\sunnecessary\ssqlite3_finalize()\soperations. +D 2018-05-18T16:53:07.242 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da @@ -355,7 +355,7 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782 F ext/repair/test/checkindex01.test 6945d0ffc0c1dc993b2ce88036b26e0f5d6fcc65da70fc9df27c2647bb358b0f F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/rtree.c 22f70cfd945a35f22c825dd33a387f8e4a760e836dbdb5b53c8604c013baa70b +F ext/rtree/rtree.c 148ae743198ca9fe1dfdf2fed74e5c3b0e69330e5b71ddc0d9df9993324dcedc F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412 F ext/rtree/rtree1.test 587889855b26fb8637417921b0709ca843cb6d36db94a882371fd8b7dcc3aa0b F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2 @@ -1729,7 +1729,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 059d20abd57727e6d312f15b640359ef778786f577d9b50b17b57195db2d0aef -R 94d7d699dafad8b4359ea156ee884062 +P 95fd296ffc8130526a1453cbdca6ce47f22fc5b5c474aa31d66b627d0c7393a1 +R 2d7f80f5a8cb7985e7256646130cf7be U drh -Z c84439bc3f7cc8054f4dee343e2e07a0 +Z 143ebe5c5507b367bd6154b3294d97b7 diff --git a/manifest.uuid b/manifest.uuid index a1b0e94190..643e5a1325 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -95fd296ffc8130526a1453cbdca6ce47f22fc5b5c474aa31d66b627d0c7393a1 \ No newline at end of file +16f71032a3a2919cb226b25b5256a370adb5c55fa506d4774b7f83dc8868e793 \ No newline at end of file