From: drh <>
Date: Mon, 4 Dec 2023 19:32:17 +0000 (+0000)
Subject: Fixes to error handling in json_array_length().
X-Git-Tag: version-3.45.0~116^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f26e26afc565d53c60eeb4d619d635d236943967;p=thirdparty%2Fsqlite.git

Fixes to error handling in json_array_length().

FossilOrigin-Name: aa85df2d26b74c171c55bde19ef17c4f11f40b8af7181bbf7162f87cdea7e88b
---

diff --git a/manifest b/manifest
index e729bdb871..c1b6b255f5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\smake\sthe\sinput\sJSONB\seditable\sin\sjson_remove()\sif\sthere\sare\sno\sPATH\nargument.
-D 2023-12-04T19:14:13.899
+C Fixes\sto\serror\shandling\sin\sjson_array_length().
+D 2023-12-04T19:32:17.504
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -688,7 +688,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 ab1eb1ab2ecedf193e0e1dc2ae62668e74ffd8668c39bf2014d419d175f6aae6
+F src/json.c 326c7149206251639111f4fe2275f66d50345da0725dec4c617d583a280e969d
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36
 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9
@@ -2145,8 +2145,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 f1a51ae3863557526a51c6e98e71fcdf4f1ed14a36212b3c90f7408f926345e4
-R fedbc77310dd69998d8c7dc42f0e4ac1
+P 66594544f3ba9977475a3e3f74404eb2b2fb845053b28bd24c2b52c7df94e9d7
+R 07c551e152c91bb13fe1d576cd87540a
 U drh
-Z e47b61cc62bf0572c657f0a0469cf19a
+Z 0dc2cc057fc8990b916cb29e965f29a3
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4c9ef95e4c..2b59f8602a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-66594544f3ba9977475a3e3f74404eb2b2fb845053b28bd24c2b52c7df94e9d7
\ No newline at end of file
+aa85df2d26b74c171c55bde19ef17c4f11f40b8af7181bbf7162f87cdea7e88b
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 97c65df0bc..6b72d3fdea 100644
--- a/src/json.c
+++ b/src/json.c
@@ -3115,11 +3115,7 @@ static void jsonArrayLengthFunc(
   if( (p->aBlob[i] & 0x0f)==JSONB_ARRAY ){
     cnt = jsonbArrayCount(p, i);
   }
-  if( eErr ){
-    if( eErr==2 ) sqlite3_result_error(ctx, "malformed JSON", -1);
-  }else{
-    sqlite3_result_int64(ctx, cnt);
-  }
+  if( !eErr ) sqlite3_result_int64(ctx, cnt);
   jsonParseFree(p);
 }