Improvements to coping with malformed JSONB.

FossilOrigin-Name: 563cde404cec4c6559ae0c5fc5edbc878fee874b36562ce2fac5049cc8349343

diff --git a/manifest b/manifest
index 218f2d0904b09a6c47111d094059b12819083e52..bc4af507a05d5f29e5fc012a8bf6c3c745aebf7e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Better\serror\sdetection\swhen\sdoing\sa\slookup\son\sa\sJSONB.
-D 2023-10-05T23:05:35.100
+C Improvements\sto\scoping\swith\smalformed\sJSONB.
+D 2023-10-06T00:06:26.513
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,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 1b3349c49b363c654b76f5f9b45c4172d13955679fd4a242b3d92c879f95294c
+F src/json.c 6758202d3fa30306ae6379c6f995158b0768e1f75e304ff604c1bb498499fcd1
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2124,8 +2124,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 ac74d7877685006e43684edd6a2d22be8c9857f9f9eb52fc5b3c182d5e2fdb8d
-R 01e239b11851146ca21382a5317a867b
+P 6e8e0eedbf06e175af6ef230f1ce9a5ad84698b1c6dcd2794d878c746e7b6be4
+R 0e32d4d167fb477dce553004066d14c6
 U drh
-Z 51245adc64c2e53d6bd1f03542705249
+Z 0df001ca326ecb2506a99289e47391a0
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index cbe2a3c96d36397891ef25924a5eeeeda6c61556..62b4fee4ffd5434d6dc71a2bfb23b510b2b1285a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e8e0eedbf06e175af6ef230f1ce9a5ad84698b1c6dcd2794d878c746e7b6be4
\ No newline at end of file
+563cde404cec4c6559ae0c5fc5edbc878fee874b36562ce2fac5049cc8349343
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 738354f00957b76e45dc5751f3458058b439f4a5..7522c9571a991c53cff83e0816f9ae36d434d3a2 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -3512,6 +3512,7 @@ static int jsonParseValueFromBlob(JsonParse *pParse, u32 i){
       if( !pParse->oom ){
         pParse->aNode[iThis].n = pParse->nNode - (u32)iThis - 1;
       }
+      if( k&1 ) return -1;
       break;
     }
   }
@@ -3724,10 +3725,10 @@ static u32 jsonLookupBlobStep(
       k = j+n;
       if( k+sz>=iEnd ) return JSON_BLOB_ERROR;
       if( sz==nKey && memcmp(&pParse->aBlob[k], zKey, nKey)==0 ){
-        j = k+sz;        
+        j = k+sz;
         if( ((pParse->aBlob[j])&0x0f)>JSONB_OBJECT ) return JSON_BLOB_ERROR;
         n = jsonbPayloadSize(pParse, j, &sz);
-        if( j+n+sz>iEnd ) return JSON_BLOB_ERROR;
+        if( n==0 || j+n+sz>iEnd ) return JSON_BLOB_ERROR;
         return jsonLookupBlobStep(pParse, j, &zPath[i], pzErr);
       }
       j = k+sz;
@@ -4031,7 +4032,7 @@ static void jsonExtractFromBlob(
   }else if( i==JSON_BLOB_NOTFOUND ){
     return;  /* Return NULL if not found */
   }else if( i==JSON_BLOB_ERROR ){
-    sqlite3_result_error(ctx, "malformed JSONB", -1);
+    sqlite3_result_error(ctx, "malformed JSON", -1);
   }else{
     sqlite3_result_error(ctx, zErr, -1);
   }
@@ -4340,7 +4341,7 @@ static void jsonExtractFunc(
   JsonString jx;
 
   if( argc<2 ) return;
-  if( sqlite3_value_type(argv[0])==SQLITE_BLOB && argc==2 ){
+  if( jsonFuncArgMightBeBinary(argv[0]) && argc==2 ){
     jsonExtractFromBlob(ctx, argv[0], argv[1], flags);
     return;
   }