Fix an assertion fault in json_patch() that can occur if the patch JSON

is malformed JSONB.  Report the malformed JSONB instead.

FossilOrigin-Name: a72d54645ca0dd80c60a5ed586049dead3ea7f5fa9ad05c6610a506242a7032a

diff --git a/manifest b/manifest
index 1d877db3b81dd611759f8312918732214fe6748b..6f76814908b7666c890e0605eccd3a54506ffb8c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\srobustness\sin\sthe\sdecoding\sof\sJSON5\stext\sescape\ssequences\sfound\nin\smalformed\sJSONB.
-D 2023-10-10T23:02:31.182
+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
 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 d86e0d27c8d99c4a9e9bbe44401224270d667118742df371a3928e0406243647
+F src/json.c 51ae066d271f4a37643921782fbcf61cf76d7166d06e9ad4ab75a32510d8b03a
 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 216191b113da43516d31301fb133173add66358d503677ab997bc82cc88bfea4
-R 3e258cb31e76158544ba210b63aec864
+P 35e0108af2bdd830375c31c525f8ed0e8df64959d89649a88402dc1a5c376612
+R 574c458e7556ba233ae1bd2b81029222
 U drh
-Z 26ce59215821be9c842a531e0d11f121
+Z b70fdf7e40754bcaf3921ae744996dea
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 37779a76ba3e6128486327aafaed9db595b1504f..c04985ac0f1a76f5e706e911f16a59ba6cf57b2c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-35e0108af2bdd830375c31c525f8ed0e8df64959d89649a88402dc1a5c376612
\ No newline at end of file
+a72d54645ca0dd80c60a5ed586049dead3ea7f5fa9ad05c6610a506242a7032a
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 8f263556a7c400a719421d4812fc5e832c24484d..0ddc9c498efbeb5c730aec4f8bcd043680c8db6c 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -4536,8 +4536,10 @@ static JsonNode *jsonMergePatch(
   for(i=1; i<pPatch->n; i += jsonNodeSize(&pPatch[i+1])+1){
     u32 nKey;
     const char *zKey;
-    assert( pPatch[i].eType==JSON_STRING );
-    assert( pPatch[i].jnFlags & JNODE_LABEL );
+    if( pPatch[i].eType!=JSON_STRING ){
+      pParse->nErr = 1;
+      return 0;
+    }
     assert( pPatch[i].eU==1 );
     nKey = pPatch[i].n;
     zKey = pPatch[i].u.zJContent;
@@ -4606,13 +4608,15 @@ static void jsonPatchFunc(
   pX->useMod = 1;
   pY->useMod = 1;
   pResult = jsonMergePatch(pX, 0, pY->aNode);
-  assert( pResult!=0 || pX->oom );
-  if( pResult && pX->oom==0 ){
+  assert( pResult!=0 || pX->oom || pX->nErr );
+  if( pX->oom ){
+    sqlite3_result_error_nomem(ctx);
+  }else if( pX->nErr ){
+    sqlite3_result_error(ctx, "malformed JSON", -1);
+  }else if( pResult ){
     jsonDebugPrintParse(pX);
     jsonDebugPrintNode(pResult);
     jsonReturnNodeAsJson(pX, pResult, ctx, 0);
-  }else{
-    sqlite3_result_error_nomem(ctx);
   }
 }