database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-11 01:42:22 +03:00
Code Activity

Remove some unnecessary code. Report errors for invalid JSONB input on

Browse Source 
an extract.

FossilOrigin-Name: cbea16c29eb0507f39b5a1cf744a3bb9bb7c71ac156e84a19d03a37cb1816891
This commit is contained in:
drh
2023-10-07 23:35:07 +00:00
parent de8ccf00fb
commit a7e9386e88
3 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/json.c
View File

@@ -2800,9 +2800,7 @@ json_parse_restart:
pParse->iErr = j;
return -1;
}
if( pParse->oom==0 ){
jsonBlobChangePayloadSize(pParse, iThis, pParse->nBlob - iStart);
}
jsonBlobChangePayloadSize(pParse, iThis, pParse->nBlob - iStart);
pParse->iDepth--;
return j+1;
}
@@ -2854,9 +2852,7 @@ json_parse_restart:
pParse->iErr = j;
return -1;
}
if( pParse->oom==0 ){
jsonBlobChangePayloadSize(pParse, iThis, pParse->nBlob - iStart);
}
jsonBlobChangePayloadSize(pParse, iThis, pParse->nBlob - iStart);
pParse->iDepth--;
return j+1;
}
@@ -3855,12 +3851,7 @@ static void jsonReturnTextJsonFromBlob(
x.nBlob = nBlob;
jsonStringInit(&s, ctx);
jsonRenderBlob(&x, 0, &s);
if( x.nErr ){
sqlite3_result_error(ctx, "malformed JSON", -1);
jsonStringReset(&s);
}else{
jsonReturnString(&s);
}
jsonReturnString(&s);
}
@@ -3903,7 +3894,6 @@ static void jsonReturnFromBlob(
int bNeg = 0;
char x = (char)pParse->aBlob[i+n];
if( x=='-' && ALWAYS(sz>0) ){ n++; sz--; bNeg = 1; }
else if( x=='+' && ALWAYS(sz>0) ){ n++; sz--; }
z = sqlite3DbStrNDup(db, (const char*)&pParse->aBlob[i+n], (int)sz);
if( z==0 ) return;
rc = sqlite3DecOrHexToI64(z, &iRes);
@@ -4031,6 +4021,10 @@ static void jsonReturnFromBlob(
}
break;
}
default: {
sqlite3_result_error(pCtx, "malformed JSON", -1);
break;
}
}
}