From: drh <>
Date: Mon, 11 Dec 2023 20:19:10 +0000 (+0000)
Subject: json_valid(*,8) allows minus-signs on hexadecimal literals.
X-Git-Tag: version-3.45.0~94^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=001caa714fc29ca13aa86605aa2c18a47f875430;p=thirdparty%2Fsqlite.git

json_valid(*,8) allows minus-signs on hexadecimal literals.

FossilOrigin-Name: c0d7f4520d839a268b3fd2474d0897a9832aa608bd6238b3e287fabecf07a350
---

diff --git a/manifest b/manifest
index 770abb234a..29dc28440b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Activate\sJSON_SELFCHECK\swithin\sfuzzcheck.
-D 2023-12-11T19:21:06.298
+C json_valid(*,8)\sallows\sminus-signs\son\shexadecimal\sliterals.
+D 2023-12-11T20:19:10.982
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -696,7 +696,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 484486f07aa17757c2277f4d3eac4b6ea174532ad27cd68288ed35b0e546bd15
+F src/json.c d0c018e1d9dba58c09518b15b4d0a1847bc8be7f7f050524618b486c8e286db8
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c ce714ee501122c76eb2e69b292bebe443aba611fc3b88e6786eb910285515fe4
@@ -2153,8 +2153,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 7aff1d9a4cb17ecd5abab21ab032f35a78741dd641ddd8cbcc85fc4a81a0707d
-R 73f673c74c17eaf64270ba7fabaefbeb
+P 4d14e733bb521aed65e98533969d2303738232ae87dab70fdf7962e6513195f5
+R a882161352f3e912beb8ce222b601993
 U drh
-Z 036937c49ad3c44a290e0f1c7a504e81
+Z 09da734bc01fda75ed726fff4da7e465
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c7f1e82f00..c1e7de9ccc 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4d14e733bb521aed65e98533969d2303738232ae87dab70fdf7962e6513195f5
\ No newline at end of file
+c0d7f4520d839a268b3fd2474d0897a9832aa608bd6238b3e287fabecf07a350
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 407705c017..b735987734 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1280,6 +1280,10 @@ static u32 jsonbValidityCheck(JsonParse *pParse, u32 i, u32 iEnd, u32 iDepth){
     case JSONB_INT5: {
       if( sz<3 ) return i+1;
       j = i+n;
+      if( z[j]=='-' ){
+        if( sz<4 ) return i+1;
+        j++;
+      }
       if( z[j]!='0' ) return j+1;
       if( z[j+1]!='x' && z[j+1]!='X' ) return j+2;
       j += 2;