Fix the text-to-JSONB parser so that it handles some JSON5 floating point

literals correctly.

FossilOrigin-Name: 564edb3b6dd752e09e445e3a25c2f5394ceede2a2cdff251d6433dadc0b3644f

diff --git a/manifest b/manifest
index dea192ba1b3dce8855254168dfce94e3a7a204d3..d1a8859d109aa3280acb6b0b42706869c5bf56cf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Slightly\sstricter\stesting\sfor\swhen\sa\sBLOB\sis\svalid\sJSONB:\s\sIf\sthe\selement\nis\sa\snull,\strue,\sor\sfalse,\sits\spayload\ssize\smust\sbe\szero.
-D 2023-10-05T16:33:00.108
+C Fix\sthe\stext-to-JSONB\sparser\sso\sthat\sit\shandles\ssome\sJSON5\sfloating\spoint\nliterals\scorrectly.
+D 2023-10-05T17:52:39.456
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c 5fce177a1fa0e0853024141e4f603cf04324833c35f1ee2484c20296236d1fa8
+F src/json.c 5b00523c237b93a0c0f644bfa2adc5cf2bf381e3a2a02791a03a1765d6ddac67
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2124,8 +2124,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bf4b36eda8e200b67041ebdf60fc31d0325bd84185272f8d390c56a91d6ac1ee
-R 82f6c0430b8291dd07f3a6ba0e331be4
+P 487781be8a93d9b8d870efb9f25822bb4bbcf9d39d571d1017e9c29043ea515d
+R 6dd39d4bbce9b9abcc4c4c2e13a0b712
 U drh
-Z fe5195d3e7cce0d43ee394c132952294
+Z 37a9884f8448701e772294f223618265
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 943883628eb11bda4ddfbdcea3f5b548a6bf7c51..233800a07fca42d38015ba075ea191028818a178 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-487781be8a93d9b8d870efb9f25822bb4bbcf9d39d571d1017e9c29043ea515d
\ No newline at end of file
+564edb3b6dd752e09e445e3a25c2f5394ceede2a2cdff251d6433dadc0b3644f
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index c405c5943a75dd14d86f6cc5d69365b1909482a2..ba701ba68e027472e3fcfe61c4776d6d82ba571c 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -2955,7 +2955,7 @@ json_parse_restart:
           }
           if( z[i+1]=='.' ){
             pParse->hasNonstd = 1;
-            t |= 0x03;
+            t |= 0x01;
             goto parse_number_2;
           }
           pParse->iErr = i;