database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-09 14:21:03 +03:00
Code Activity

Fix bugs uncovered by the fuzzer.

Browse Source 
FossilOrigin-Name: c96eb7fb618dc0a5aeec8a5e85076475b77dcd56309438aba1f9bddfc8921e3c
This commit is contained in:
drh
2023-10-10 18:04:40 +00:00
parent cc5e612db4
commit 064c1688da
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/json.c
View File

@@ -2861,6 +2861,7 @@ json_parse_restart:
case '\'': {
u8 opcode;
char cDelim;
int nn;
pParse->hasNonstd = 1;
opcode = JSONB_TEXT;
goto parse_string;
@@ -2869,7 +2870,8 @@ json_parse_restart:
opcode = JSONB_TEXT;
parse_string:
cDelim = z[i];
for(j=i+1; 1; j++){
nn = pParse->nJson;
for(j=i+1; j<nn; j++){
if( jsonIsOk[(unsigned char)z[j]] ) continue;
c = z[j];
if( c==cDelim ){
@@ -3351,9 +3353,9 @@ static u32 jsonXlateBlobToText(
for(k=0; k<sz2 && zIn[k]!='\\'; k++){}
if( k>0 ){
jsonAppendRawNZ(pOut, zIn, k);
if( sz2<=k ) break;
zIn += k;
sz2 -= k;
if( sz2==0 ) break;
}
assert( zIn[0]=='\\' );
switch( (u8)zIn[1] ){
@@ -3366,8 +3368,12 @@ static u32 jsonXlateBlobToText(
case 'x':
jsonAppendRawNZ(pOut, "\\u00", 4);
jsonAppendRawNZ(pOut, &zIn[2], 2);
zIn += 2;
sz2 -= 2;
if( sz2<2 ){
sz2 = 0;
}else{
zIn += 2;
sz2 -= 2;
}
break;
case '0':
jsonAppendRawNZ(pOut, "\\u0000", 6);
@@ -3391,6 +3397,7 @@ static u32 jsonXlateBlobToText(
jsonAppendRawNZ(pOut, zIn, 2);
break;
}
if( sz2<2 ) break;
zIn += 2;
sz2 -= 2;
}