aboutsummaryrefslogtreecommitdiff
path: root/ext/misc/json1.c
diff options
context:
space:
mode:
authordrh <>2021-11-15 01:45:11 +0000
committerdrh <>2021-11-15 01:45:11 +0000
commita2852ac4d279922959035429d81f38cd43f46ca4 (patch)
tree5fde265ef03baf1726b1cfbdf834918600039bc9 /ext/misc/json1.c
parent146121f5cb5ca97da56c1bf48bc22ba7629409c9 (diff)
downloadsqlite-a2852ac4d279922959035429d81f38cd43f46ca4.tar.gz
sqlite-a2852ac4d279922959035429d81f38cd43f46ca4.zip
Fix a faulty JSON assert() added 30 days ago by check-in [7b8ea2298927fd34].
dbsqlfuzz f30366e7b02562398a387ddcc681422fd4251190. FossilOrigin-Name: 0e0c23fcc493a5d6beb6ab9554981bbc36ba1554fea0f8ba78dc41738f4bd1c2
Diffstat (limited to 'ext/misc/json1.c')
-rw-r--r--ext/misc/json1.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 0adf710ef..7fcd7342a 100644
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1662,8 +1662,11 @@ static JsonNode *jsonMergePatch(
if( pNew==0 ) return 0;
pTarget = &pParse->aNode[iTarget];
if( pNew!=&pTarget[j+1] ){
- assert( pTarget[j+1].eU==0 || pTarget[j+1].eU==1 );
+ assert( pTarget[j+1].eU==0
+ || pTarget[j+1].eU==1
+ || pTarget[j+1].eU==2 );
testcase( pTarget[j+1].eU==1 );
+ testcase( pTarget[j+1].eU==2 );
VVA( pTarget[j+1].eU = 5 );
pTarget[j+1].u.pPatch = pNew;
pTarget[j+1].jnFlags |= JNODE_PATCH;