Fix a problem in the geopoly json parser associated with spaces before a

coordinate number.

FossilOrigin-Name: 9d8d3af89ab241fd6c68e043e559359c85653aa0e31270b658ff01867ae929c4

diff --git a/ext/rtree/geopoly.c b/ext/rtree/geopoly.c
index 9e8de3cfeee23673a9c10e77eac510ea7661df8a..5ae2b8f22d1b156f76fa75c1018301a9f64ce445 100644 (file)
--- a/ext/rtree/geopoly.c
+++ b/ext/rtree/geopoly.c
@@ -146,8 +146,8 @@ static char geopolySkipSpace(GeoParse *p){
 ** return non-zero on success and zero if the next token is not a number.
 */
 static int geopolyParseNumber(GeoParse *p, GeoCoord *pVal){
-  const unsigned char *z = p->z;
   char c = geopolySkipSpace(p);
+  const unsigned char *z = p->z;
   int j;
   int seenDP = 0;
   int seenE = 0;

diff --git a/manifest b/manifest
index bdb5f15c7bc3814743b99b55b3d62752acb2d538..3d0a40be7675d80c51c3bae16c4e8a4278eb9ce3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\sgeopoly\svirtual\stable\sseems\sto\sbe\sworking.\s\sBut\sonly\sthinly\stested\sso\sfar.
-D 2018-05-28T23:59:03.555
+C Fix\sa\sproblem\sin\sthe\sgeopoly\sjson\sparser\sassociated\swith\sspaces\sbefore\sa\ncoordinate\snumber.
+D 2018-05-29T17:17:22.931
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 51407f0e371dcb9e65d368bd4f1a08fc17ef8361ff11aac9356f0f63693b38dd
@@ -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/geopoly.c 95626633e615db611c6a61a7cc2c060d7dedea8338a92a4345e4ecce045fe0e8
+F ext/rtree/geopoly.c 524f336f28d2f2c3c5abf2238c07964e4ddebce441ca79489d08f7f2fae3b27e
 F ext/rtree/rtree.c f3c2f1b5eea75b98d4d3dcdec2ebf2a69c036b53f2f3d196e61bf5016298255f
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 309afc04d4287542b2cd74f933296832cc681c7b014d9405cb329b62053a5349
@@ -1731,7 +1731,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 ed06cc32568a3abaa0535b379e0ee3b04ffb7582dcda6405670620d1fbe8996c
-R 81c5a462839f4fc8f38c54f9f8566edf
+P 4288f1ad5966701eac4cfe3061e8ce98e34e0d6c112307668729642a06458d5f
+R 10d3e455a51f13d4bc5211661301b72f
 U drh
-Z 985d2eedc536b0a7cccf298a1cefc057
+Z 37cefd68e4dc10f83a5c791f1094a8b3

diff --git a/manifest.uuid b/manifest.uuid
index 260a10c2c6b64965c8ec950f1242e7950188722b..6580f9fd41e25984ed80b465b7fe9870bbe69d4b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4288f1ad5966701eac4cfe3061e8ce98e34e0d6c112307668729642a06458d5f
\ No newline at end of file
+9d8d3af89ab241fd6c68e043e559359c85653aa0e31270b658ff01867ae929c4
\ No newline at end of file