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

Fixes to rendering JSON5 extensions encoded as JSONB.

Browse Source 
FossilOrigin-Name: 5a17e4479aad2d8313170e5de83a1c52f30b55d9d4fb776024fa6622e175c63b
This commit is contained in:
drh
2023-10-06 15:35:42 +00:00
parent e690d5ad80
commit 98dbfa69d3
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Fix\scompiler\swarnings. C Fixes\sto\srendering\sJSON5\sextensions\sencoded\sas\sJSONB.
D 2023-10-06T14:59:40.414 D 2023-10-06T15:35:42.574
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
@@ -670,7 +670,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 e1a4c5ffadbeaab6dfd9dfb687f8c7a0b9e012ad2ec8b74223e75f86295a5a5e F src/json.c 07cbae93a65485082e3a2b7900b0c5e3912a5dd37ea0d948af54fec0fe39855c
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
@@ -2124,8 +2124,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 b41dd237fb6c0dd7daedeaaf81dbc4fdb31cf511fd32cd3d4ee69db34e389915 P 5227add3c8d509de2e081249163fafdf30ac3173a6d710957f3c3b6f03e7017e
R d43877b0997e4344224eb4366c47821e R 4cd522c574d0ec5aee66d5dc3b63f485
U drh U drh
Z 0dbbe0cfb7ed03f93b950daed7da83cd Z 9624fe80ac16daaa792bb7c1f316d34b
# 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 @@
5227add3c8d509de2e081249163fafdf30ac3173a6d710957f3c3b6f03e7017e 5a17e4479aad2d8313170e5de83a1c52f30b55d9d4fb776024fa6622e175c63b

20
src/json.c
View File

@@ -3308,15 +3308,16 @@ static u32 jsonRenderBlob(
case JSONB_TEXT5: { case JSONB_TEXT5: {
const char *zIn; const char *zIn;
u32 k; u32 k;
u32 sz2 = sz;
zIn = (const char*)&pParse->aBlob[i+n]; zIn = (const char*)&pParse->aBlob[i+n];
jsonAppendChar(pOut, '"'); jsonAppendChar(pOut, '"');
while( sz>0 ){ while( sz2>0 ){
for(k=0; k<sz && 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);
zIn += k; zIn += k;
sz -= k; sz2 -= k;
if( sz==0 ) break; if( sz2==0 ) break;
} }
assert( zIn[0]=='\\' ); assert( zIn[0]=='\\' );
switch( (u8)zIn[1] ){ switch( (u8)zIn[1] ){
@@ -3330,7 +3331,7 @@ static u32 jsonRenderBlob(
jsonAppendRawNZ(pOut, "\\u00", 4); jsonAppendRawNZ(pOut, "\\u00", 4);
jsonAppendRawNZ(pOut, &zIn[2], 2); jsonAppendRawNZ(pOut, &zIn[2], 2);
zIn += 2; zIn += 2;
sz -= 2; sz2 -= 2;
break; break;
case '0': case '0':
jsonAppendRawNZ(pOut, "\\u0000", 6); jsonAppendRawNZ(pOut, "\\u0000", 6);
@@ -3338,24 +3339,24 @@ static u32 jsonRenderBlob(
case '\r': case '\r':
if( zIn[2]=='\n' ){ if( zIn[2]=='\n' ){
zIn++; zIn++;
sz--; sz2--;
} }
break; break;
case '\n': case '\n':
break; break;
case 0xe2: case 0xe2:
assert( sz>=4 ); assert( sz2>=4 );
assert( 0x80==(u8)zIn[2] ); assert( 0x80==(u8)zIn[2] );
assert( 0xa8==(u8)zIn[3] || 0xa9==(u8)zIn[3] ); assert( 0xa8==(u8)zIn[3] || 0xa9==(u8)zIn[3] );
zIn += 2; zIn += 2;
sz -= 2; sz2 -= 2;
break; break;
default: default:
jsonAppendRawNZ(pOut, zIn, 2); jsonAppendRawNZ(pOut, zIn, 2);
break; break;
} }
zIn += 2; zIn += 2;
sz -= 2; sz2 -= 2;
} }
jsonAppendChar(pOut, '"'); jsonAppendChar(pOut, '"');
break; break;
@@ -3387,6 +3388,7 @@ static u32 jsonRenderBlob(
} }
default: { default: {
pOut->eErr |= JSTRING_MALFORMED;
break; break;
} }
} }