diff options
| author | dan <Dan Kennedy> | 2021-10-30 17:30:48 +0000 |
|---|---|---|
| committer | dan <Dan Kennedy> | 2021-10-30 17:30:48 +0000 |
| commit | e7c23433fb77aa3741e6008d624039392f6af7d0 (patch) | |
| tree | aae0e1a9d7fbca33f1de6bb46b573e16f20dfd58 /ext/misc/json1.c | |
| parent | 60a2fc8244db40752c7b8d09ea3e8432b80bed03 (diff) | |
| parent | e4e1af5efb91767192cd440ebd7ec7999f6751f4 (diff) | |
| download | sqlite-e7c23433fb77aa3741e6008d624039392f6af7d0.tar.gz sqlite-e7c23433fb77aa3741e6008d624039392f6af7d0.zip | |
Merge trunk changes into this branch.
FossilOrigin-Name: 638c1b0c50229800067eb1ba29d829b4d6e008256c21a1f67b4ce4d19ea307b3
Diffstat (limited to 'ext/misc/json1.c')
| -rw-r--r-- | ext/misc/json1.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/misc/json1.c b/ext/misc/json1.c index df6dcba76..70f344ea0 100644 --- 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; |