Improved error detection for JSONB inputs.

FossilOrigin-Name: 6945e11aa441ace52b93cdbb81ac45b6f809987f3dbc522251e63f8cb948fddd

diff --git a/manifest b/manifest
index 7a0a01ea06234fd735cdb474a61b573b57044a2f..5fe562b491ec7c36f503311b89f5b389e3fab749 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Incremental\simprovements\sto\sthe\sJSONB\slogic.
-D 2023-10-06T18:21:47.497
+C Improved\serror\sdetection\sfor\sJSONB\sinputs.
+D 2023-10-06T22:16:09.559
 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 7a37b75ae7a31399af464627f923232f88bdee093af5148445f0df42ee85bd77
+F src/json.c b806a942b8abe97c95eef416fe6b467687e3b6452db35bf53746b19bd6800d5f
 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 5a17e4479aad2d8313170e5de83a1c52f30b55d9d4fb776024fa6622e175c63b
-R 83990e8b89665f4fb2543aa74cc93235
+P fe326829c27715e249f727ba797c7df6491e874ec205a0a82ee09c78d61c6e1f
+R 37a35a123339c5edc35b6af8c811707d
 U drh
-Z e604af5f00b43366ef6886bc95452ede
+Z 5c69847c848dbc8186c5994996d772c2
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7926def15834fbca35146bd7d0690fd5f32a8bbc..8c40873330aba7b435d5053d8660e3baf4fd252b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe326829c27715e249f727ba797c7df6491e874ec205a0a82ee09c78d61c6e1f
\ No newline at end of file
+6945e11aa441ace52b93cdbb81ac45b6f809987f3dbc522251e63f8cb948fddd
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 62dc44b8306a74edd67f7a9e2a3bbe60a0806438..25aa186e9a7b5517722a92e93f6761787f625951 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -3284,8 +3284,10 @@ static u32 jsonRenderBlob(
       for(; k<sz; k++){
         if( !sqlite3Isxdigit(zIn[k]) ){
           pOut->eErr |= JSTRING_MALFORMED;
+          break;
+        }else{
+          u = u*16 + sqlite3HexToInt(zIn[k]);
         }
-        u = u*16 + sqlite3HexToInt(zIn[k]);
       }
       jsonPrintf(100,pOut,"%llu",u);
       break;