From: drh <>
Date: Wed, 11 Oct 2023 12:21:29 +0000 (+0000)
Subject: Improved robustness against corrupt JSONB.
X-Git-Tag: version-3.45.0~116^2~79
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33b56217cb7f1ced7553449daccc032230a8b53a;p=thirdparty%2Fsqlite.git

Improved robustness against corrupt JSONB.

FossilOrigin-Name: 0fbda92bb0eeb40f95c83f717e4e8f5bff1ac82f1c899e9f6d400d67df67214e
---

diff --git a/manifest b/manifest
index 6f76814908..c5837f11b5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassertion\sfault\sin\sjson_patch()\sthat\scan\soccur\sif\sthe\spatch\sJSON\nis\smalformed\sJSONB.\s\sReport\sthe\smalformed\sJSONB\sinstead.
-D 2023-10-11T11:42:06.265
+C Improved\srobustness\sagainst\scorrupt\sJSONB.
+D 2023-10-11T12:21:29.280
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -674,7 +674,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 51ae066d271f4a37643921782fbcf61cf76d7166d06e9ad4ab75a32510d8b03a
+F src/json.c 4130133dcd43ac5c9b71a88a47f5ba8b6453d7cfbf158ebeb57ddd89f5def919
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2129,8 +2129,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 35e0108af2bdd830375c31c525f8ed0e8df64959d89649a88402dc1a5c376612
-R 574c458e7556ba233ae1bd2b81029222
+P a72d54645ca0dd80c60a5ed586049dead3ea7f5fa9ad05c6610a506242a7032a
+R e706082c7e7e2d4bd83182da6946ab5f
 U drh
-Z b70fdf7e40754bcaf3921ae744996dea
+Z 820cb01f77053065d828d065556f10f5
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index c04985ac0f..aa52b1f5c1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a72d54645ca0dd80c60a5ed586049dead3ea7f5fa9ad05c6610a506242a7032a
\ No newline at end of file
+0fbda92bb0eeb40f95c83f717e4e8f5bff1ac82f1c899e9f6d400d67df67214e
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 0ddc9c498e..ff735f36f3 100644
--- a/src/json.c
+++ b/src/json.c
@@ -981,7 +981,7 @@ static void jsonXlateNodeToText(
       u32 j = 1;
       jsonAppendChar(pOut, '{');
       for(;;){
-        while( j<=pNode->n ){
+        while( j<pNode->n ){
           if( (pNode[j+1].jnFlags & JNODE_REMOVE)==0 || pParse->useMod==0 ){
             jsonAppendSeparator(pOut);
             jsonXlateNodeToText(pParse, &pNode[j], pOut);
@@ -1054,7 +1054,7 @@ static void jsonReturnNodeAsJson(
 ** character:  0..9a..fA..F
 */
 static u8 jsonHexToInt(int h){
-  assert( (h>='0' && h<='9') ||  (h>='a' && h<='f') ||  (h>='A' && h<='F') );
+  if( !sqlite3Isxdigit(h) ) return 0;
 #ifdef SQLITE_EBCDIC
   h += 9*(1&~(h>>4));
 #else
@@ -1068,10 +1068,6 @@ static u8 jsonHexToInt(int h){
 */
 static u32 jsonHexToInt4(const char *z){
   u32 v;
-  assert( sqlite3Isxdigit(z[0]) );
-  assert( sqlite3Isxdigit(z[1]) );
-  assert( sqlite3Isxdigit(z[2]) );
-  assert( sqlite3Isxdigit(z[3]) );
   v = (jsonHexToInt(z[0])<<12)
     + (jsonHexToInt(z[1])<<8)
     + (jsonHexToInt(z[2])<<4)