From: drh <>
Date: Mon, 4 Dec 2023 18:53:10 +0000 (+0000)
Subject: Fix errors in rendering JSON5 escape sequences embedded in JSONB.
X-Git-Tag: version-3.45.0~116^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fedb7e59e6a5208f006cad5e02be79abdd2e759;p=thirdparty%2Fsqlite.git

Fix errors in rendering JSON5 escape sequences embedded in JSONB.

FossilOrigin-Name: f1a51ae3863557526a51c6e98e71fcdf4f1ed14a36212b3c90f7408f926345e4
---

diff --git a/manifest b/manifest
index 7f065bdc52..7e8f87147a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Continuing\ssimplifications\sand\scode\scleanup.
-D 2023-12-04T17:40:28.698
+C Fix\serrors\sin\srendering\sJSON5\sescape\ssequences\sembedded\sin\sJSONB.
+D 2023-12-04T18:53:10.232
 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 0e9fc8f2f2fecb1b4e7904ead93aa98313483ca4fea1d564e252e445f717b226
+F src/json.c b3a194fc1db52f1b169d9779a0d9155b4c123e8492a921114a5381700ea6c81d
 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 f601de3eeabd85993c1f5ee96b62de6fdabbeae2fe8950e00d08feb48d42c498
-R c9ebf0dbf5357376ee89626a26211c09
+P ddf92b5059a9106753fd18b82ba8daa269a62af947561c460790107b83416f0b
+R 2f4c11a457fe80bb549ac0019420b08f
 U drh
-Z 2f59464d9d28542ea091e094068881ef
+Z 9def50f1dac0c1957715ee3f6f843ba7
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b3d16e9d7b..030ca873ab 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ddf92b5059a9106753fd18b82ba8daa269a62af947561c460790107b83416f0b
\ No newline at end of file
+f1a51ae3863557526a51c6e98e71fcdf4f1ed14a36212b3c90f7408f926345e4
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index dc884b9fd3..aefd47498f 100644
--- a/src/json.c
+++ b/src/json.c
@@ -2401,7 +2401,10 @@ static void jsonReturnFromBlob(
   sqlite3 *db = sqlite3_context_db_handle(pCtx);
 
   n = jsonbPayloadSize(pParse, i, &sz);
-  if( n==0 ) return;
+  if( n==0 ){
+    sqlite3_result_error(pCtx, "malformed JSON", -1);
+    return;
+  }
   switch( pParse->aBlob[i] & 0x0f ){
     case JSONB_NULL: {
       sqlite3_result_null(pCtx);
@@ -2483,7 +2486,7 @@ static void jsonReturnFromBlob(
             }else{
               u32 vlo;
               if( (v&0xfc00)==0xd800
-                && i<n-6
+                && iIn<sz-6
                 && z[iIn+1]=='\\'
                 && z[iIn+2]=='u'
                 && ((vlo = jsonHexToInt4(z+iIn+3))&0xfc00)==0xdc00
@@ -2525,8 +2528,9 @@ static void jsonReturnFromBlob(
             iIn++;
             continue;
           }else if( 0xe2==(u8)c
-                 && 0x80==(u8)z[i+1]
-                 && (0xa8==(u8)z[i+2] || 0xa9==(u8)z[i+2])
+                 && iIn<sz-2
+                 && 0x80==(u8)z[iIn+1]
+                 && (0xa8==(u8)z[iIn+2] || 0xa9==(u8)z[iIn+2])
           ){
             iIn += 2;
             continue;