Remove dead code. Improved reporting of errors in JSON inputs.

FossilOrigin-Name: 2eaa738e6b5c1b67b3e57c868d9c3a30eea38a0b3b8b02482f06d57a45b10921

diff --git a/manifest b/manifest
index fb3e811b9c58a3fcd3f3fa0068dc15487af1a67d..6b01ad342f6584100bc588dd083264c7c995161e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\sproblems\swhen\sthe\spath\sargument\sto\sjson_tree()\scontains\sembedded\sU+0000\ncharacters.
-D 2023-12-03T23:30:59.212
+C Remove\sdead\scode.\s\sImproved\sreporting\sof\serrors\sin\sJSON\sinputs.
+D 2023-12-03T23:38:24.696
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -688,7 +688,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 6ac93a6cc3cbfa8be1b4058c7aa335ede339a36b65be5fdde0593bd428ee74cc
+F src/json.c 2f824bf3cb7f6018476fef922afd13aaa5fbe063ded53cf556d9542c5e81a95c
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +2145,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 aa0e02b5c26a2ef3d6216a0ed8bc01382be43173485f898cb63f2a8c559f2e74
-R 04d47333f96a5f7bc80310aa6a2b6c34
+P 9f055091af01a5dddba1a7e9868ad030c8f206237e1569215cb161e53e54aa71
+R 37598996ac6084b4bcb164d59f053e89
 U drh
-Z 051e2555795818c726068d0b4b3820ce
+Z 62d813bb1b1f385603ccfef947a3746b
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a0e2cc933f841c9d9548a5fc27b8b319a9a28e6c..dc5d8dab105877e23a3f428e1b31ae32350bf095 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f055091af01a5dddba1a7e9868ad030c8f206237e1569215cb161e53e54aa71
\ No newline at end of file
+2eaa738e6b5c1b67b3e57c868d9c3a30eea38a0b3b8b02482f06d57a45b10921
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index f7e1591ad25ef9f72047b5644dac84a14345c20a..1e88b517436ab234950efd5b29efffbc2e88c8f8 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -1729,6 +1729,7 @@ static int jsonConvertTextToBlob(
     if( zJson[i] ){
       i += json5Whitespace(&zJson[i]);
       if( zJson[i] ){
+        if( pCtx ) sqlite3_result_error(pCtx, "malformed JSON", -1);
         jsonParseReset(pParse);
         return 1;
       }
@@ -2801,9 +2802,6 @@ rebuild_from_cache:
     p->hasNonstd = pFromCache->hasNonstd;
     jsonParseFree(pFromCache);
     return p;
-  }else{
-    jsonParseFree(pFromCache);
-    pFromCache = 0;
   }
   if( eType==SQLITE_BLOB ){
     u32 n, sz = 0;