From: drh <drh@noemail.net>
Date: Thu, 27 Jul 2017 00:27:57 +0000 (+0000)
Subject: Do now allow the geometry object in the right operand of a MATCH operator in
X-Git-Tag: version-3.19.4~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e50dc1de3d4cf9a9bb4fc31104b349e5b80e3ac4;p=thirdparty%2Fsqlite.git

Do now allow the geometry object in the right operand of a MATCH operator in
the RTREE extension to be inpersonated by a BLOB literal.

FossilOrigin-Name: 24c9cd460051781f7e6417b7e205274319258f061ae1191a6c5ff5af615439c9
---

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 2f80af5644..28a7c56fcf 100644
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -346,6 +346,7 @@ struct RtreeGeomCallback {
 ** value to avoid operating on invalid blobs (which could cause a segfault).
 */
 #define RTREE_GEOMETRY_MAGIC 0x891245AB
+#define RTREE_GEOMETRY_SUBTYPE 0x52
 
 /*
 ** An instance of this structure (in the form of a BLOB) is returned by
@@ -1655,7 +1656,11 @@ static int deserializeGeometry(sqlite3_value *pValue, RtreeConstraint *pCons){
   int nExpected;                     /* Expected size of the BLOB */
 
   /* Check that value is actually a blob. */
-  if( sqlite3_value_type(pValue)!=SQLITE_BLOB ) return SQLITE_ERROR;
+  if( sqlite3_value_type(pValue)!=SQLITE_BLOB
+   || sqlite3_value_subtype(pValue)!=RTREE_GEOMETRY_SUBTYPE
+  ){
+    return SQLITE_ERROR;
+  }
 
   /* Check that the blob is roughly the right size. */
   nBlob = sqlite3_value_bytes(pValue);
@@ -3726,6 +3731,7 @@ static void geomCallback(sqlite3_context *ctx, int nArg, sqlite3_value **aArg){
       rtreeMatchArgFree(pBlob);
     }else{
       sqlite3_result_blob(ctx, pBlob, nBlob, rtreeMatchArgFree);
+      sqlite3_result_subtype(ctx, RTREE_GEOMETRY_SUBTYPE);
     }
   }
 }
diff --git a/manifest b/manifest
index 5b7be2b7f8..afe26f8645 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.19.3
-D 2017-06-08T14:26:16.283
+C Do\snow\sallow\sthe\sgeometry\sobject\sin\sthe\sright\soperand\sof\sa\sMATCH\soperator\sin\nthe\sRTREE\sextension\sto\sbe\sinpersonated\sby\sa\sBLOB\sliteral.
+D 2017-07-27T00:27:57.692
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 8eeb80162074004e906b53d7340a12a14c471a83743aab975947e95ce061efcc
@@ -273,7 +273,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 8205d6e4466f766e57ce1b8aa38224ac9e1cec2d2bf4684cd1cc5a6ddf9b7014
+F ext/rtree/rtree.c 497a3040fdb41ba0cc04434b434a6b9e7b0ece78b2de5f9544b60b646a8e5aaa
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test d5f0ba215b3bd1d05269ada86e74073b8445852aa0d33a63e10ec63a09c39473
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1580,10 +1580,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 97b5c4a53d0af3792c5ae5ceafdb02245f841c2bd4d79bcfd0ffdf6c5ff27c9e
-R b94272eb5bee6b36b4ac20fd561bc415
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.19.3 *
+P 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
+R 5aba315ce772ced25c1b87936307ec42
 U drh
-Z 0ee14e0381c757607413d6046358676f
+Z c0ec9b17a9a0e51afaa3dc2485cf6a08
diff --git a/manifest.uuid b/manifest.uuid
index fd64fbcbc1..24b676d883 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b
\ No newline at end of file
+24c9cd460051781f7e6417b7e205274319258f061ae1191a6c5ff5af615439c9
\ No newline at end of file