Fix a potential UAF caused by JSON parser cache spill.

FossilOrigin-Name: ce3fc4fc23e55b6cb75b13b9bb0696c6ad5178c7f02cd5fef1c851f1391d75d5

diff --git a/manifest b/manifest
index bc3688d48c8e8e787dca114d5ee7357312083417..51acb684f800d673d865e807d2444985bccb9767 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\spost-3.43.0\swal2\sfixes\sinto\sthe\sbedrock-3.43\sbranch.
-D 2023-09-09T15:30:19.109
+C Fix\sa\spotential\sUAF\scaused\sby\sJSON\sparser\scache\sspill.
+D 2023-11-10T13:13:10.468
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -652,7 +652,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 51141f1c09ccb177057e5813e6302a5e32e5ba88cc4a756318a35081010fc6df
+F src/json.c 5c25f82e1c0f3eb44fb9a23feff6b7b952fd40122d9e3ab601a84ea83710a980
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c e56843b488ead74369eeffc64cd5b9d3a7ffbf8621bb0cd695272d9b9ce53afa
@@ -1294,7 +1294,7 @@ F test/json/README.md 63e3e589e1df8fd3cc1588ba1faaff659214003f8b77a15af5c6452b35
 F test/json/json-generator.tcl dc0dd0f393800c98658fc4c47eaa6af29d4e17527380cd28656fb261bddc8a3f
 F test/json/json-q1.txt 65f9d1cdcc4cffa9823fb73ed936aae5658700cd001fde448f68bfb91c807307
 F test/json/json-speed-check.sh 8b7babf530faa58bd59d6d362cec8e9036a68c5457ff46f3b1f1511d21af6737 x
-F test/json101.test dc9d5a2a5b1fd1b54dbd71c538b17933cc98d84b4c1f821ead754933663dca55
+F test/json101.test 4d78048b185ffb9ae37645fa6934d48fc182473ae0bae088a1e2f7ba483c3a71
 F test/json102.test 4c69694773a470f1fda34e5f4ba24920b35184fb66050b450fc2ef9ab5ad310b
 F test/json103.test 53df87f83a4e5fa0c0a56eb29ff6c94055c6eb919f33316d62161a8880112dbe
 F test/json104.test 1b844a70cddcfa2e4cd81a5db0657b2e61e7f00868310f24f56a9ba0114348c1
@@ -2129,8 +2129,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 4cefd16e6d7828522ca8a61ac4ebc0228263f6ada30d7191f9d1b2032af59bcf f82b1a0bde3f836e25b704084674e3bee609ecea3dc9ef259218989bd1198482
-R 70826041da459780f9165fd12bc6e9a2
+P 48ecf390dafedc64ffa75665b381c2fccb69f4df8285639734410ee51e677a4f
+Q +a163fecca90cab9d1b7bf8ebac78d498775eed7b6d81e7920e3401633c3a4b60
+R 4c265088330f2b71d2c065f9a8ac7f5d
 U drh
-Z 88ece64d7f5a55569a060781215fb897
+Z 51cd99442bb83e7beeaa491d89e947f6
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index b58950af19cd1eea377bc44bc1c37fac9955aa3e..38b2ac4945e0947c0a8255b12c6c4d7dd8cb8d7f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48ecf390dafedc64ffa75665b381c2fccb69f4df8285639734410ee51e677a4f
\ No newline at end of file
+ce3fc4fc23e55b6cb75b13b9bb0696c6ad5178c7f02cd5fef1c851f1391d75d5
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 253fce9f49db3ccd961ab0417b6f962839464335..2e81948e76501d1d99121840e1f39cd071d1591b 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -2902,6 +2902,7 @@ static void jsonReplaceFunc(
   }
   pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
   if( pParse==0 ) return;
+  pParse->nJPRef++;
   for(i=1; i<(u32)argc; i+=2){
     zPath = (const char*)sqlite3_value_text(argv[i]);
     pParse->useMod = 1;
@@ -2914,6 +2915,7 @@ static void jsonReplaceFunc(
   jsonReturnJson(pParse, pParse->aNode, ctx, 1);
 replace_err:
   jsonDebugPrintParse(pParse);
+  jsonParseFree(pParse);
 }
 
 
@@ -2948,6 +2950,7 @@ static void jsonSetFunc(
   }
   pParse = jsonParseCached(ctx, argv[0], ctx, argc>1);
   if( pParse==0 ) return;
+  pParse->nJPRef++;
   for(i=1; i<(u32)argc; i+=2){
     zPath = (const char*)sqlite3_value_text(argv[i]);
     bApnd = 0;
@@ -2964,9 +2967,8 @@ static void jsonSetFunc(
   }
   jsonDebugPrintParse(pParse);
   jsonReturnJson(pParse, pParse->aNode, ctx, 1);
-
 jsonSetDone:
-  /* no cleanup required */;
+  jsonParseFree(pParse);
 }
 
 /*

diff --git a/test/json101.test b/test/json101.test
index 4da1d132cce0bc19131633d47e075b8652580952..45903307400aaad33b4e9723d94a93b2a9489e58 100644 (file)
--- a/test/json101.test
+++ b/test/json101.test
@@ -1013,8 +1013,31 @@ do_execsql_test json101-21.27 {
   SELECT json_group_object(x,y) FROM c;
 } {{{"a":1,"b":2.0,"c":null,:"three","e":"four"}}}
 
-
-
+# 2023-10-09 https://sqlite.org/forum/forumpost/b25edc1d46
+# UAF due to JSON cache overflow
+#
+do_execsql_test json101-22.1 {
+  SELECT json_set(
+    '{}',
+    '$.a', json('1'),
+    '$.a', json('2'),
+    '$.b', json('3'),
+    '$.b', json('4'),
+    '$.c', json('5'),
+    '$.c', json('6')
+  );
+} {{{"a":2,"b":4,"c":6}}}
+do_execsql_test json101-22.2 {
+  SELECT json_replace(
+    '{"a":7,"b":8,"c":9}',
+    '$.a', json('1'),
+    '$.a', json('2'),
+    '$.b', json('3'),
+    '$.b', json('4'),
+    '$.c', json('5'),
+    '$.c', json('6')
+  );
+} {{{"a":2,"b":4,"c":6}}}
 
 
 finish_test