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

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

12
manifest
View File

@@ -1,5 +1,5 @@
C Merge\sthe\slatest\strunk\senhancements\sinto\sthe\sjsonb\sbranch. C Fix\sbugs\suncovered\sby\sthe\sfuzzer.
D 2023-10-10T17:34:41.118 D 2023-10-10T18:04:40.744
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -674,7 +674,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
F src/json.c bbf52181d04e09852e273f11cf31544a8030ffc911359cb7f77e39f252cce7a6 F src/json.c 7df84bb5b918dca3e9c4361989a3667bf1ca080299fdf9947e6f99b39d7523af
F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2129,8 +2129,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P db44bd1d62084ef69c808f7d07e0a25d5a089dcb8b98b1b5d026777591bbdefc 65ccf5fef812d43aed9e00af36c90e1a499d197e30148753790445e25ee1324c P f93f16c94d0a58dfa90939e84aba048be958c7b085b45a6f25c2243fdf79b3aa
R 7120be3e2682c2f2dc1a6290819c2e25 R 77f1fc6f77b161facff6daa6dc651655
U drh U drh
Z a077701d7ef896cae6a827ec97befa72 Z 2b3feb335f873a4bcfbf7b38cfcaa6e3
# Remove this line to create a well-formed Fossil manifest. # Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@@ -1 +1 @@
f93f16c94d0a58dfa90939e84aba048be958c7b085b45a6f25c2243fdf79b3aa c96eb7fb618dc0a5aeec8a5e85076475b77dcd56309438aba1f9bddfc8921e3c

15
src/json.c
View File

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