From: drh <>
Date: Sat, 7 Oct 2023 09:13:59 +0000 (+0000)
Subject: Report unknown JSONB element type when parsing JSONB into JsonNode.
X-Git-Tag: version-3.45.0~116^2~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=522e880bc263a2b7afa3234fe473532cc054348c;p=thirdparty%2Fsqlite.git

Report unknown JSONB element type when parsing JSONB into JsonNode.

FossilOrigin-Name: 1f4d3268257bda234c66c3767451b3d39d7b4c7c73a779ad396d9dfc5315905c
---

diff --git a/manifest b/manifest
index 7ea0301feb..25c5daf405 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Correct\shandling\sof\s"raw"\sstrings\sin\sJSON.\s\sThis\srequires\sthree\stest-case\nchanges\sin\sTH3\sto\sadd\sdouble-quotes\sto\sthe\spath\soutputs\sfrom\sjson_tree().\nThe\snew\sbehavior\sis\scorrect,\sI\sbelieve.
-D 2023-10-06T23:02:06.178
+C Report\sunknown\sJSONB\selement\stype\swhen\sparsing\sJSONB\sinto\sJsonNode.
+D 2023-10-07T09:13:59.445
 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 4d2527a8f01797bc4a83ca282f4ea82a5e4a1fdbb05260df241a4a76d2e610b9
+F src/json.c e1a1da1393d89d9845dccb57cb1e37fa9b753294946c2779d2c94dddbdee799b
 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 6945e11aa441ace52b93cdbb81ac45b6f809987f3dbc522251e63f8cb948fddd
-R 9a8ad0594c72d0104c485b0093cb4da0
+P ab2bf3e3596dfa7566f4a130adeccbef4056c7321181112a875477193583f30c
+R 6dab506825da64397c11d8b8419cab92
 U drh
-Z 53c0ada212c66efecbd15c380158c623
+Z be12a743f89d2812c7cba83b03ca7a82
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c079911246..68c204be9d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ab2bf3e3596dfa7566f4a130adeccbef4056c7321181112a875477193583f30c
\ No newline at end of file
+1f4d3268257bda234c66c3767451b3d39d7b4c7c73a779ad396d9dfc5315905c
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 850f2bbf48..3c2af6e845 100644
--- a/src/json.c
+++ b/src/json.c
@@ -3528,8 +3528,7 @@ static int jsonParseValueFromBlob(JsonParse *pParse, u32 i){
       break;
     }
     default: {
-      pParse->nErr++;
-      break;
+      return -1;
     }
   }
   return i+x+sz;