From: drh <>
Date: Tue, 21 Nov 2023 19:05:22 +0000 (+0000)
Subject: Correct blob-to-text rendering in some corner cases.
X-Git-Tag: version-3.45.0~116^2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1df37b9477da7d0345c3faac628d5e7603bde7d;p=thirdparty%2Fsqlite.git

Correct blob-to-text rendering in some corner cases.

FossilOrigin-Name: 7822e0e59f9b611fe6289cc762b0aff61f9b87c3a82c60de110f447589a2c125
---

diff --git a/manifest b/manifest
index 7e945f8442..ad10087655 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\stranslation\sof\sJSON5\snumeric\svalues\sfrom\sBLOB\sinto\stext.
-D 2023-11-21T18:23:43.037
+C Correct\sblob-to-text\srendering\sin\ssome\scorner\scases.
+D 2023-11-21T19:05:22.846
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -685,7 +685,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 c5d4b35c598f50e5be9191260ae92be4073d17bff84daa0dd64c31edbb7dce7e
+F src/json.c 54e4261d68a463bb8e8adf7ce0ba9c8ad2853870ce53e4e5f903c6a97eb8b644
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2142,8 +2142,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 6d78d50ed2357e6c943c1ef97b1d2ea0902cbadef90c2c35dccdbdc2bdf8702f
-R 2ba901c1c280b3893e91bda5d71d76cb
+P 40c4fb441f220982e4d61fd42597cf18546791a302fbcc8eec2eed29ee15ef35
+R e0de56e45777fbb83b14bb9ecc453e36
 U drh
-Z 574e66b6116d2f9186df90de5e4b8fb3
+Z 0c3d75110c96246c67d1b5a0fbc45fae
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 7e841c3b50..0085f7c96b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-40c4fb441f220982e4d61fd42597cf18546791a302fbcc8eec2eed29ee15ef35
\ No newline at end of file
+7822e0e59f9b611fe6289cc762b0aff61f9b87c3a82c60de110f447589a2c125
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 69950766da..199bc5e18d 100644
--- a/src/json.c
+++ b/src/json.c
@@ -3372,6 +3372,7 @@ static u32 jsonXlateBlobToText(
       u32 k = 2;
       sqlite3_uint64 u = 0;
       const char *zIn = (const char*)&pParse->aBlob[i+n];
+      int bOverflow = 0;
       if( zIn[0]=='-' ){
         jsonAppendChar(pOut, '-');
         k++;
@@ -3382,11 +3383,13 @@ static u32 jsonXlateBlobToText(
         if( !sqlite3Isxdigit(zIn[k]) ){
           pOut->eErr |= JSTRING_MALFORMED;
           break;
+        }else if( (u>>60)!=0 ){
+          bOverflow = 1;
         }else{
           u = u*16 + sqlite3HexToInt(zIn[k]);
         }
       }
-      jsonPrintf(100,pOut,"%llu",u);
+      jsonPrintf(100,pOut,bOverflow?"9.0e999":"%llu", u);
       break;
     }
     case JSONB_FLOAT5: { /* Float literal missing digits beside "." */
@@ -3519,6 +3522,7 @@ static u32 jsonXlateBlobToText(
         j = jsonXlateBlobToText(pParse, j, pOut);
         jsonAppendChar(pOut, (x++ & 1) ? ',' : ':');
       }
+      if( x & 1 ) pOut->eErr |= JSTRING_MALFORMED;
       if( sz>0 ) pOut->nUsed--;
       jsonAppendChar(pOut, '}');
       break;