From: drh <>
Date: Tue, 2 May 2023 11:12:01 +0000 (+0000)
Subject: Improved handling of NULL arguments to json_valid() and
X-Git-Tag: version-3.42.0~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c79ea844793a7ad30acc991da39b22af25c300d;p=thirdparty%2Fsqlite.git

Improved handling of NULL arguments to json_valid() and
json_error_position(). [forum:/forumpost/06c6334412|Forum post 06c6334412].

FossilOrigin-Name: ab78e6946ba8125a83ff155561adf9c8df4d1c09a645fce08c8245ddb08bfa3b
---

diff --git a/manifest b/manifest
index 558e2eed8d..43474ee29c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stypo\sin\scomment.\s\s[forum:/forumpost/3da7d9c445|Forum\spost\s3da7d9c445].
-D 2023-05-02T10:22:05.731
+C Improved\shandling\sof\sNULL\sarguments\sto\sjson_valid()\sand\njson_error_position().\s[forum:/forumpost/06c6334412|Forum\spost\s06c6334412].
+D 2023-05-02T11:12:01.595
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4
-F src/json.c d24acf11f291728454cb4fa04a6ff01242fa5adc5e709698a6549a343dcf3c4f
+F src/json.c acb60ec1585a98b25b18d064384f31959405e5591246480db557e264133f5939
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d
@@ -1256,7 +1256,7 @@ F test/json/README.md 506af1f54574b524106acb50d1a341ab5ddfa6d83fe25095007892b07e
 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f
 F test/json/json-q1.txt 335a7c8ab291d354f33b7decc9559e99a2823d4142291c4be7aa339a631f3c2d
 F test/json/json-speed-check.sh 8b7babf530faa58bd59d6d362cec8e9036a68c5457ff46f3b1f1511d21af6737 x
-F test/json101.test 211d75638782370c07e10a847bd66e501ea1537f39c7da4447bfa055c0f261db
+F test/json101.test ff8024cbb8092e723237648cea9bdbd51f31476b5015a4df3a5ecc8a5efda837
 F test/json102.test 13dc9e7b7f359ecb861e02f9bd7019f7342a63d1c354273b0a8f3904050560a8
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
@@ -2068,8 +2068,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 ad6aae768ad0816bfd1c8e9db5c0153226982d3af9a089f31e608223339e9829
-R 75b63009a85208adf7bba398404174e3
+P 41a8a15c4b6f6157b12d43976e300763ef8a4963986d2806557ad0d8b0a784cd
+R ac8e37433aff844778b8019ba20de84e
 U drh
-Z f13cf165f55d1155b732975be8f5e7cd
+Z fdf5f91c1580ba93eac92cce90bc0c2d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 5acee09904..ce36252b48 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-41a8a15c4b6f6157b12d43976e300763ef8a4963986d2806557ad0d8b0a784cd
\ No newline at end of file
+ab78e6946ba8125a83ff155561adf9c8df4d1c09a645fce08c8245ddb08bfa3b
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 24fb0a49de..9808db6fe3 100644
--- a/src/json.c
+++ b/src/json.c
@@ -2556,6 +2556,7 @@ static void jsonValidFunc(
 ){
   JsonParse *p;          /* The parse */
   UNUSED_PARAMETER(argc);
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
   p = jsonParseCached(ctx, argv, 0);
   if( p==0 || p->oom ){
     sqlite3_result_error_nomem(ctx);
@@ -2601,6 +2602,7 @@ static void jsonErrorFunc(
 ){
   JsonParse *p;          /* The parse */
   UNUSED_PARAMETER(argc);
+  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
   p = jsonParseCached(ctx, argv, 0);
   if( p==0 || p->oom ){
     sqlite3_result_error_nomem(ctx);
diff --git a/test/json101.test b/test/json101.test
index 298dc3bdbc..e17c8cd6a2 100644
--- a/test/json101.test
+++ b/test/json101.test
@@ -918,4 +918,97 @@ do_execsql_test json-20.3 {
   SELECT json_object('a',2e370,'b',-3e380)->>'b';
 } {-Inf}
 
+# 2023-05-02 https://sqlite.org/forum/forumpost/06c6334412
+# JSON functions should normally return NULL when given
+# a NULL value as the JSON input.
+#
+db null NULL
+do_execsql_test json-21.1 {
+  SELECT json_valid(NULL);
+} NULL
+do_execsql_test json-21.2 {
+  SELECT json_error_position(NULL);
+} NULL
+do_execsql_test json-21.3 {
+  SELECT json(NULL);
+} NULL
+do_execsql_test json-21.4 {
+  SELECT json_array(NULL);
+} {[null]}
+do_execsql_test json-21.5 {
+  SELECT json_extract(NULL);
+} NULL
+do_execsql_test json-21.6 {
+  SELECT json_insert(NULL,'$',123);
+} NULL
+do_execsql_test json-21.7 {
+  SELECT NULL->0;
+} NULL
+do_execsql_test json-21.8 {
+  SELECT NULL->>0;
+} NULL
+do_execsql_test json-21.9 {
+  SELECT '{a:5}'->NULL;
+} NULL
+do_execsql_test json-21.10 {
+  SELECT '{a:5}'->>NULL;
+} NULL
+do_catchsql_test json-21.11 {
+  SELECT json_object(NULL,5);
+} {1 {json_object() labels must be TEXT}}
+do_execsql_test json-21.12 {
+  SELECT json_patch(NULL,'{a:5}');
+} NULL
+do_execsql_test json-21.13 {
+  SELECT json_patch('{a:5}',NULL);
+} NULL
+do_execsql_test json-21.14 {
+  SELECT json_patch(NULL,NULL);
+} NULL
+do_execsql_test json-21.15 {
+  SELECT json_remove(NULL,'$');
+} NULL
+do_execsql_test json-21.16 {
+  SELECT json_remove('{a:5,b:7}',NULL);
+} NULL
+do_execsql_test json-21.17 {
+  SELECT json_replace(NULL,'$.a',123);
+} NULL
+do_execsql_test json-21.18 {
+  SELECT json_replace('{a:5,b:7}',NULL,NULL);
+} {{{"a":5,"b":7}}}
+do_execsql_test json-21.19 {
+  SELECT json_set(NULL,'$.a',123);
+} NULL
+do_execsql_test json-21.20 {
+  SELECT json_set('{a:5,b:7}',NULL,NULL);
+} {{{"a":5,"b":7}}}
+do_execsql_test json-21.21 {
+  SELECT json_type(NULL);
+} NULL
+do_execsql_test json-21.22 {
+  SELECT json_type('{a:5,b:7}',NULL);
+} NULL
+do_execsql_test json-21.23 {
+  SELECT json_quote(NULL);
+} null
+do_execsql_test json-21.24 {
+  SELECT count(*) FROM json_each(NULL);
+} 0
+do_execsql_test json-21.25 {
+  SELECT count(*) FROM json_tree(NULL);
+} 0
+do_execsql_test json-21.26 {
+  WITH c(x) AS (VALUES(1),(2.0),(NULL),('three'))
+  SELECT json_group_array(x) FROM c;
+} {[1,2.0,null,"three"]}
+do_execsql_test json-21.27 {
+  WITH c(x,y) AS (VALUES('a',1),('b',2.0),('c',NULL),(NULL,'three'),('e','four'))
+  SELECT json_group_object(x,y) FROM c;
+} {{{"a":1,"b":2.0,"c":null,:"three","e":"four"}}}
+
+
+
+
+
 finish_test