From: drh <>
Date: Sat, 7 Oct 2023 19:46:22 +0000 (+0000)
Subject: The return from sqlite3_value_blob() in jsonFuncArgMightBeBinary() might
X-Git-Tag: version-3.45.0~116^2~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de8ccf00fbe12a0c4f353224e94412ef0be13090;p=thirdparty%2Fsqlite.git

The return from sqlite3_value_blob() in jsonFuncArgMightBeBinary() might
be a NULL pointer.  Check for that case.

FossilOrigin-Name: 7b52b266b066f1385144c1103a3a411306db5f44568366ae1e93cd8cce799bbc
---

diff --git a/manifest b/manifest
index 3e86195bd3..76e3968de4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdetection\sof\smalformed\sJSONB\swhen\sparsing\sit\sinto\sa\sJsonNode\sarray.
-D 2023-10-07T19:40:20.950
+C The\sreturn\sfrom\ssqlite3_value_blob()\sin\sjsonFuncArgMightBeBinary()\smight\nbe\sa\sNULL\spointer.\s\sCheck\sfor\sthat\scase.
+D 2023-10-07T19:46:22.897
 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 98ef9894e38f07a5565160b297754937ff3ac2b800241f16a60c6168251d3aa3
+F src/json.c 6b0c502122ad2e306888e2c32eebd8c5b46c36e6b6f3ae1662c81e4a26d48410
 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 8d6d04ca975ec55c419d40d8463c433b0db698c9fb4812ab9f16d4ee5bee460e
-R 6b6b7362eeaf8bd29175dff0f94e9ac1
+P ed99a788415e1f8375bd5ec004dd18b1cd0fae4aa94558170882ca487f6dff93
+R d7e7cc74e75e3ba90c541936a8c94fd0
 U drh
-Z 3aae7be717232d09cf2cbfe5dd8cc288
+Z 327a5a9c0b0e46cc41c5ed6d2b8be3ed
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 46067f0f9c..2445478af5 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed99a788415e1f8375bd5ec004dd18b1cd0fae4aa94558170882ca487f6dff93
\ No newline at end of file
+7b52b266b066f1385144c1103a3a411306db5f44568366ae1e93cd8cce799bbc
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 1cfaaaf58a..f2cb796889 100644
--- a/src/json.c
+++ b/src/json.c
@@ -3451,7 +3451,7 @@ static int jsonFuncArgMightBeBinary(sqlite3_value *pJson){
   nBlob = sqlite3_value_bytes(pJson);
   if( nBlob<1 ) return 0;
   aBlob = sqlite3_value_blob(pJson);
-  if( (aBlob[0] & 0x0f)>JSONB_OBJECT ) return 0;
+  if( aBlob==0 || (aBlob[0] & 0x0f)>JSONB_OBJECT ) return 0;
   memset(&s, 0, sizeof(s));
   s.aBlob = (u8*)aBlob;
   s.nBlob = nBlob;