Be strict about type enforcement on rowid look-ups in the RTREE extension.

Ticket [30e2c183b6b356e4]

FossilOrigin-Name: d43e0efb9642037dd751cfed13438e71cfceb50e14a0ec603880c6c3be2e93b1

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 5d8152ecfb29950cbc6deecbeaf5ec9c669e67a3..6bb31066767a931382757d7eec77857440fdd335 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -1817,7 +1817,15 @@ static int rtreeFilter(
     RtreeSearchPoint *p;     /* Search point for the leaf */
     i64 iRowid = sqlite3_value_int64(argv[0]);
     i64 iNode = 0;
-    rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
+    int eType = sqlite3_value_numeric_type(argv[0]);
+    if( eType==SQLITE_INTEGER
+     || (eType==SQLITE_FLOAT && sqlite3_value_double(argv[0])==iRowid)
+    ){
+      rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
+    }else{
+      rc = SQLITE_OK;
+      pLeaf = 0;
+    }
     if( rc==SQLITE_OK && pLeaf!=0 ){
       p = rtreeSearchPointNew(pCsr, RTREE_ZERO, 0);
       assert( p!=0 );  /* Always returns pCsr->sPoint */

diff --git a/ext/rtree/rtree1.test b/ext/rtree/rtree1.test
index 5f2d8cb621dcd6564440d04a7596adefd77da105..86ae18210d97807dd39bdfac4e2fa0b0cb333e5e 100644 (file)
--- a/ext/rtree/rtree1.test
+++ b/ext/rtree/rtree1.test
@@ -601,15 +601,29 @@ do_execsql_test 14.5 {
   1 0.0 0.0
   2 52.0 81.0
 }
+do_execsql_test 14.6 {
+  INSERT INTO t10 VALUES(0,10,20);
+  SELECT * FROM t10 WHERE ii=NULL;
+} {}
+do_execsql_test 14.7 {
+  SELECT * FROM t10 WHERE ii='xyz';
+} {}
+do_execsql_test 14.8 {
+  SELECT * FROM t10 WHERE ii='0.0';
+} {0 10.0 20.0}
+do_execsql_test 14.9 {
+  SELECT * FROM t10 WHERE ii=0.0;
+} {0 10.0 20.0}
 
-do_execsql_test 14.4 {
+
+do_execsql_test 14.104 {
   DROP TABLE t10;
   CREATE VIRTUAL TABLE t10 USING rtree_i32(ii, x1, x2);
   INSERT INTO t10 VALUES(1, 'one', 'two');
   INSERT INTO t10 VALUES(2, '52xyz', '81...');
   INSERT INTO t10 VALUES(3, 42.3, 49.9);
 }
-do_execsql_test 14.5 {
+do_execsql_test 14.105 {
   SELECT * FROM t10;
 } {
   1 0 0

diff --git a/ext/rtree/rtreeH.test b/ext/rtree/rtreeH.test
index bff765d53094d8b8dedcc7a44a46ebc1fa675f71..e26107f075dde755f406aa202c7dad5237b19cb3 100644 (file)
--- a/ext/rtree/rtreeH.test
+++ b/ext/rtree/rtreeH.test
@@ -43,10 +43,33 @@ do_execsql_test rtreeH-101 {
 do_execsql_test rtreeH-102 {
   SELECT * FROM t1 WHERE rowid=5;
 } {5 40.0 60.0 40.0 60.0 center {}}
+do_execsql_test rtreeH-102b {
+  SELECT * FROM t1 WHERE rowid=5.0;
+} {5 40.0 60.0 40.0 60.0 center {}}
+do_execsql_test rtreeH-102c {
+  SELECT * FROM t1 WHERE rowid='5';
+} {5 40.0 60.0 40.0 60.0 center {}}
+do_execsql_test rtreeH-102d {
+  SELECT * FROM t1 WHERE rowid='0005';
+} {5 40.0 60.0 40.0 60.0 center {}}
+do_execsql_test rtreeH-102e {
+  SELECT * FROM t1 WHERE rowid='+5.0e+0';
+} {5 40.0 60.0 40.0 60.0 center {}}
 do_execsql_test rtreeH-103 {
   SELECT * FROM t1 WHERE label='center';
 } {5 40.0 60.0 40.0 60.0 center {}}
 
+do_execsql_test rtreeH-104 {
+  SELECT * FROM t1 WHERE rowid='+5.0e+0x';
+} {}
+do_execsql_test rtreeH-105 {
+  SELECT * FROM t1 WHERE rowid=x'35';
+} {}
+do_execsql_test rtreeH-106 {
+  SELECT * FROM t1 WHERE rowid=null;
+} {}
+
+
 do_rtree_integrity_test rtreeH-110 t1
 
 do_execsql_test rtreeH-120 {

diff --git a/manifest b/manifest
index a7ee3b7df413ae85fe295242446cf2f0ed1fb154..a6f7b2ddc2fc65d9b776ad8960ecce43aa3963af 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sthe\sRTREE\sextension\sso\sthat\sit\sgive\scorrect\squery\sresults\seven\sif\nthe\squery\suses\snon-numeric\sconstraints.\s\sTicket\s[a55ab6d97d01ecbc]
-D 2019-12-05T00:44:47.681
+C Be\sstrict\sabout\stype\senforcement\son\srowid\slook-ups\sin\sthe\sRTREE\sextension.\nTicket\s[30e2c183b6b356e4]
+D 2019-12-05T13:34:13.759
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -380,9 +380,9 @@ F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c3350
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/geopoly.c c591164125808f8bba9659e92665b78412cd263e654b6f05294f3a8da7cdd9fb
-F ext/rtree/rtree.c 32fa0d4864c01f0fa10dcd832c0d0a4a345fd7ba1769a6e115fac91e313f8b39
+F ext/rtree/rtree.c 615434285a07d8579abf593adf27a44c5129c941682faa61fcccd54c7fcaf7c2
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
-F ext/rtree/rtree1.test e3ce6e087fb353a74a81111303cd0f1fb07dab2c45f8902b18d29c234de933d7
+F ext/rtree/rtree1.test 1b84301b1593eac1f1d52a11eb7bccabe6f40f6d3c77ef0d1f5a2b204a4823d4
 F ext/rtree/rtree2.test 5f25b01acd03470067a2d52783b2eb0a50bf836803d4342d20ca39e541220fe2
 F ext/rtree/rtree3.test 4ee5d7df86040efe3d8d84f141f2962a7745452200a7cba1db06f86d97050499
 F ext/rtree/rtree4.test 304de65d484540111b896827e4261815e5dca4ce28eeecd58be648cd73452c4b
@@ -398,7 +398,7 @@ F ext/rtree/rtreeD.test fe46aa7f012e137bd58294409b16c0d43976c3bb92c8f710481e577c
 F ext/rtree/rtreeE.test e65d3fc625da1800b412fc8785817327d43ccfec5f5973912d8c9e471928caa9
 F ext/rtree/rtreeF.test 81ffa7ef51c4e4618d497a57328c265bf576990c7070633b623b23cd450ed331
 F ext/rtree/rtreeG.test 1b9ca6e3effb48f4161edaa463ddeaa8fca4b2526d084f9cbf5dbe4e0184939c
-F ext/rtree/rtreeH.test aa08cc4fa8005b4c67446c7110205055b4d6da90e760e6f44b82dfa4cdf8d87a
+F ext/rtree/rtreeH.test 0885151ee8429242625600ae47142cca935332c70a06737f35af53a7bd7aaf90
 F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195
 F ext/rtree/rtree_util.tcl db734b4c5e75fed6acc56d9701f2235345acfdec750b5fc7b587936f5f6bceed
 F ext/rtree/rtreecheck.test d67d5b3e9e45bfa8cd90734e8e9302144ac415b8e9176c6f02d4f92892ee8a35
@@ -1851,7 +1851,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 35f0b5a8c7921f7419eeb11be8201fd6988047042fcaeffa297fc322bc480c1f
-R 59432be563f25ea34414d49cf934c8ee
+P f898d04cf272ef0130dcae146cb86d8630b10a6f19aecfc2fa70e97e082bd51c
+R 43002ccc1aa0c6f8e78e71e8eda63e47
 U drh
-Z ba24d0240ff12d2e7363e0acb5f9ac29
+Z 20c19c840e908cae663bc6abea14a14d

diff --git a/manifest.uuid b/manifest.uuid
index c6f2af2fa340768caa09e1947e8b2f254fad3e4c..cfa3fe12bedc0f9b202baaf614e2c84c8c045f96 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f898d04cf272ef0130dcae146cb86d8630b10a6f19aecfc2fa70e97e082bd51c
\ No newline at end of file
+d43e0efb9642037dd751cfed13438e71cfceb50e14a0ec603880c6c3be2e93b1
\ No newline at end of file