Fix an incorrect JSON assert() that was added 5 days ago by check-in [7b8ea2298927fd34].

FossilOrigin-Name: e162da3ab4c183b67872be004035c48fc8f20084bc5757aec27410ce23a36631

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index df6dcba76df4b57c66a45fe818541dd29e2dabf4..70f344ea01eab2fef6b111091f4c43d41d7978ab 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1680,7 +1680,8 @@ static JsonNode *jsonMergePatch(
       if( pParse->oom ) return 0;
       jsonRemoveAllNulls(pPatch);
       pTarget = &pParse->aNode[iTarget];
-      assert( pParse->aNode[iRoot].eU==0 );
+      assert( pParse->aNode[iRoot].eU==0 || pParse->aNode[iRoot].eU==2 );
+      testcase( pParse->aNode[iRoot].eU==2 );
       pParse->aNode[iRoot].jnFlags |= JNODE_APPEND;
       VVA( pParse->aNode[iRoot].eU = 2 );
       pParse->aNode[iRoot].u.iAppend = iStart - iRoot;

diff --git a/manifest b/manifest
index 8655020c1b53106f8f9462bed92d1ca99a163913..f4a1eebc38fa9b7b39a6cb596de05f5e7d844a40 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sfinish_test\sproc\sin\stester.tcl\sso\sthat\sit\sworks\sfor\sWindows\stest\nbuilds.\s\sFix\sfor\sproblem\sintroduced\syesterday\sby\scheck-in\s[3658417bf300e004].
-D 2021-10-20T18:17:31.262
+C Fix\san\sincorrect\sJSON\sassert()\sthat\swas\sadded\s5\sdays\sago\sby\scheck-in\s[7b8ea2298927fd34].
+D 2021-10-20T20:22:37.259
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -306,7 +306,7 @@ F ext/misc/fileio.c 57fefd0efc535e62bb8b07fa146875171481da81a759bbfbe2fc91bab900
 F ext/misc/fossildelta.c 1240b2d3e52eab1d50c160c7fe1902a9bd210e052dc209200a750bbf885402d5
 F ext/misc/fuzzer.c eae560134f66333e9e1ca4c8ffea75df42056e2ce8456734565dbe1c2a92bf3d
 F ext/misc/ieee754.c 91a5594071143a4ab79c638fe9f059af1db09932faf2e704c3e29216a7d4f511
-F ext/misc/json1.c 9344f0c08fe74119022466384557c849f21fb4a15e8314f70847b1831c500f29
+F ext/misc/json1.c 2ff65a8f97c9b8ae03124fe89a1b74197e68958882cb533daac8a694d1b81c57
 F ext/misc/memstat.c 3017a0832c645c0f8c773435620d663855f04690172316bd127270d1a7523d4d
 F ext/misc/memtrace.c 7c0d115d2ef716ad0ba632c91e05bd119cb16c1aedf3bec9f06196ead2d5537b
 F ext/misc/memvfs.c 7dffa8cc89c7f2d73da4bd4ccea1bcbd2bd283e3bb4cea398df7c372a197291b
@@ -1929,7 +1929,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ae8dd132db8331ca9cc42ad511066924f9d3a1d158ecdb630cebc41b6bd2493
-R 3118246a821316ba678380f724f46b08
+P f52b84e69e5fcbe59ccc6163e7e78aa3822f2c354c88f8a76a2d1d4c90a99821
+R 670ebc316cf1a452957a2d11a7221cf2
 U drh
-Z e61d5b6226e546ad207433c5c688d2ff
+Z 70867d1471ed7c4b89f3d005caea5399

diff --git a/manifest.uuid b/manifest.uuid
index 745bb973add0017aa0276bb3ff6aa923b352300d..2057820b87766ca8695df6fadec82f742e3d3903 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f52b84e69e5fcbe59ccc6163e7e78aa3822f2c354c88f8a76a2d1d4c90a99821
\ No newline at end of file
+e162da3ab4c183b67872be004035c48fc8f20084bc5757aec27410ce23a36631
\ No newline at end of file