From: drh <>
Date: Mon, 24 Jul 2023 23:27:05 +0000 (+0000)
Subject: It is an error to try to insert a BLOB value into JSON.
X-Git-Tag: version-3.43.0~114^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b715fe9d80b3656fd0afb82847932e6592306609;p=thirdparty%2Fsqlite.git

It is an error to try to insert a BLOB value into JSON.

FossilOrigin-Name: 28c6e964b1e2257527df02b352f02e135f7c4b764b8b41eda6461f9538f5d042
---

diff --git a/manifest b/manifest
index 7f3392f540..192ed6f6b3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clean\sup\ssome\s#defines\sin\sjson.
-D 2023-07-24T22:45:59.601
+C It\sis\san\serror\sto\stry\sto\sinsert\sa\sBLOB\svalue\sinto\sJSON.
+D 2023-07-24T23:27:05.772
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -598,7 +598,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 a12c5517137b9ab77183b4a15084da264c32190f834fd3d45fda1eb77d9e327a
+F src/json.c fc5b67025d4ca026d5c0696cfd5c265c1cd0fa2f669fbe78d268e955f853e75c
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
 F src/main.c 512b1d45bc556edf4471a845afb7ba79e64bd5b832ab222dc195c469534cd002
@@ -2044,8 +2044,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 ecdcb1ded76e9a0591bf7a2009679f49fc3aa639d3cc12406c6d29243ed8e1c5
-R c1e40d83b9a43b4c127658e4fcf06fd6
+P 327fff501e36f75d4901c520123c5ca45e0e0da1d9cc8fa8fa877ceb68c686d2
+R bdfb959c0be321608fe703b9663eda08
 U drh
-Z 6091135e309dfa309be3fb90139aabae
+Z 1ec3b6ff4cb1459575429b1da04d690b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 91a2b6e391..9eac82e0e2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-327fff501e36f75d4901c520123c5ca45e0e0da1d9cc8fa8fa877ceb68c686d2
\ No newline at end of file
+28c6e964b1e2257527df02b352f02e135f7c4b764b8b41eda6461f9538f5d042
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 217c1070c9..0ce68f1fcb 100644
--- a/src/json.c
+++ b/src/json.c
@@ -733,10 +733,12 @@ static void jsonReturnJson(
     sqlite3_result_error_nomem(pCtx);
     return;
   }
-  jsonInit(&s, pCtx);
-  jsonRenderNode(pParse, pNode, &s);
-  jsonResult(&s);
-  sqlite3_result_subtype(pCtx, JSON_SUBTYPE);
+  if( pParse->nErr==0 ){
+    jsonInit(&s, pCtx);
+    jsonRenderNode(pParse, pNode, &s);
+    jsonResult(&s);
+    sqlite3_result_subtype(pCtx, JSON_SUBTYPE);
+  }
 }
 
 /*
@@ -2705,6 +2707,11 @@ static void jsonReplaceNode(
       }
       break;
     }
+    case SQLITE_BLOB: {
+      sqlite3_result_error(pCtx, "JSON cannot hold BLOB values", -1);
+      p->nErr++;
+      break;
+    }
   }
 }