From 297e2bdb8ebaf12f1357f4852f5af6ee3f4978eb Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 8 Apr 2017 01:09:14 +0000 Subject: [PATCH] Make sure the RTree sqlite3_blob handle is reset prior to renaming the table. FossilOrigin-Name: 1cdae2db3c54970a1811e597065724578408c84d49d75b8fe25d56281ddc2e94 --- ext/rtree/rtree.c | 1 + manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c index 42f08a9628..cf233b5d77 100644 --- a/ext/rtree/rtree.c +++ b/ext/rtree/rtree.c @@ -3198,6 +3198,7 @@ static int rtreeRename(sqlite3_vtab *pVtab, const char *zNewName){ , pRtree->zDb, pRtree->zName, zNewName ); if( zSql ){ + nodeBlobReset(pRtree); rc = sqlite3_exec(pRtree->db, zSql, 0, 0, 0); sqlite3_free(zSql); } diff --git a/manifest b/manifest index 4e3b8e1575..1daa23aa3b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\s".dump"\scommand\sso\sthat\sit\sworks\swith\s".headers\son".\s\sAlso\sfix\sthe\ndisplay\sof\s".mode\sinsert"\swith\s".headers\son". -D 2017-04-08T00:55:13.524 +C Make\ssure\sthe\sRTree\ssqlite3_blob\shandle\sis\sreset\sprior\sto\srenaming\sthe\stable. +D 2017-04-08T01:09:14.963 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a @@ -271,7 +271,7 @@ F ext/rbu/sqlite3rbu.c 2a89efba9eeba8e6c89a498dc195e8efbdde2694 F ext/rbu/sqlite3rbu.h 6fb6294c34a9ca93b5894a33bca530c6f08decba F ext/rbu/test_rbu.c 5aa22616afac6f71ebd3d9bc9bf1006cfabcca88 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761 -F ext/rtree/rtree.c 0acd285bfacc347579a5df9fe947212fb99e2775a40c43f027c3a16936c58e7e +F ext/rtree/rtree.c fb7c0e62ccbbbd6951ddb1f52feaa2c1a53b7ac1c6f2d5d5e2bbd31c33e57186 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e F ext/rtree/rtree1.test 42dadfc7b44a436cd74a1bebc0b9b689e4eaf7ec F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba @@ -1570,7 +1570,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 7307352988174a6c2756dbbe200bf62a45fb4cc1da7faa2c6b0f75e229eab703 -R c90966020932134529ac766bef984a02 +P a6ce57ee3c7f3527554a75cc1dd5ebcd33c944d4dca07b134d103596a2ae5b32 +R 3c395c133d10b004a02ebb26bdf0b765 U drh -Z e8c368ee65564e309cb032faeb68575a +Z 01dd2f30379ae3acc62144bb2fdec0d4 diff --git a/manifest.uuid b/manifest.uuid index 53d4b77bf8..2ca0677bc2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a6ce57ee3c7f3527554a75cc1dd5ebcd33c944d4dca07b134d103596a2ae5b32 \ No newline at end of file +1cdae2db3c54970a1811e597065724578408c84d49d75b8fe25d56281ddc2e94 \ No newline at end of file