From: drh <drh@noemail.net>
Date: Mon, 21 Apr 2014 15:53:45 +0000 (+0000)
Subject: Be sure to initialize the sqlite3_rtree_query_info.iRowid field for the
X-Git-Tag: version-3.13.0~148^2~145^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74188329ce6084e428e3fa9ddc9d1c5419819718;p=thirdparty%2Fsqlite.git

Be sure to initialize the sqlite3_rtree_query_info.iRowid field for the
leaves of the R-Tree when doing a query callback search.

FossilOrigin-Name: 4394693882c04c19ebe87ef7547c57e679554397
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 4f843a3d46..a471514c53 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -962,6 +962,9 @@ static int rtreeCallbackConstraint(
   assert( pConstraint->op==RTREE_MATCH || pConstraint->op==RTREE_QUERY );
   assert( nCoord==2 || nCoord==4 || nCoord==6 || nCoord==8 || nCoord==10 );
 
+  if( pConstraint->op==RTREE_MATCH && pSearch->iLevel==1 ){
+    pInfo->iRowid = readInt64(pCellData);
+  }
   pCellData += 8;
   for(i=0; i<nCoord; i++, pCellData += 4){
     RTREE_DECODE_COORD(eInt, pCellData, aCoord[i]);
diff --git a/manifest b/manifest
index dd1b8e9de2..992786f329 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\soff-by-one\serror\sin\ssetting\sthe\s"iLevel"\sfield\sof\sthe\nsqlite3_rtree_query_info\sstructure\spassed\sinto\sthe\sRTree\squery\scallback.
-D 2014-04-21T15:21:19.367
+C Be\ssure\sto\sinitialize\sthe\ssqlite3_rtree_query_info.iRowid\sfield\sfor\sthe\nleaves\sof\sthe\sR-Tree\swhen\sdoing\sa\squery\scallback\ssearch.
+D 2014-04-21T15:53:45.432
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -120,7 +120,7 @@ F ext/misc/vfslog.c fe40fab5c077a40477f7e5eba994309ecac6cc95
 F ext/misc/vtshim.c babb0dc2bf116029e3e7c9a618b8a1377045303e
 F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 09000d72086c21979960426bc9b592a6007bfb8d
+F ext/rtree/rtree.c 2474c438614edfc171bd9a85e3374f732511d962
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test e2da4aaa426918d27122d1a1066c6ecf8409a514
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1177,7 +1177,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 6f3e94f4b1b403cd7bfc5e8e0ffbd61b5174d3a4
-R 9cd9b8456e5c8aff94fe9550b50b870a
+P d708f159abfb3b87e2844463088d4fb7f8da9c97
+R b6276022832016ce4c25e5317a578a57
 U drh
-Z 1f57c8fdc97d1a8a65988c09a5e9a0f3
+Z 8b38b422713df2439dae120af50d35b5
diff --git a/manifest.uuid b/manifest.uuid
index 89bf0fdeca..ceffd746e2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d708f159abfb3b87e2844463088d4fb7f8da9c97
\ No newline at end of file
+4394693882c04c19ebe87ef7547c57e679554397
\ No newline at end of file