Fossil SCM

Merge trunk into wcag-2.1 branch for deployment on test server.

stephan 2022-11-16 16:09 wcag-2.1 merge
Commit 56d8000a536112aec925b5e12936e8ab1d27ce356fee21fdccca06b1a6870735
Parent ba3fa28d6882132…
3 files changed +2 -2 +14 -7 +2 -1
~ extsrc/shell.c ~ extsrc/sqlite3.c ~ extsrc/sqlite3.h
M extsrc/shell.c
+2 -2
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -11841,11 +11841,11 @@
1184111841
 static void dbdataValue(
1184211842
 sqlite3_context *pCtx,
1184311843
 u32 enc,
1184411844
 int eType,
1184511845
 u8 *pData,
11846
- int nData
11846
+ sqlite3_int64 nData
1184711847
 ){
1184811848
 if( eType>=0 && dbdataValueBytes(eType)<=nData ){
1184911849
 switch( eType ){
1185011850
 case 0:
1185111851
 case 10:
@@ -12277,11 +12277,11 @@
1227712277
 sqlite3_result_int(ctx, pCsr->iField);
1227812278
 break;
1227912279
 case DBDATA_COLUMN_VALUE: {
1228012280
 if( pCsr->iField<0 ){
1228112281
 sqlite3_result_int64(ctx, pCsr->iIntkey);
12282
- }else{
12282
+ }else if( &pCsr->pRec[pCsr->nRec] >= pCsr->pPtr ){
1228312283
 sqlite3_int64 iType;
1228412284
 dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
1228512285
 dbdataValue(
1228612286
 ctx, pCsr->enc, iType, pCsr->pPtr,
1228712287
 &pCsr->pRec[pCsr->nRec] - pCsr->pPtr
1228812288
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -11841,11 +11841,11 @@
11841 static void dbdataValue(
11842 sqlite3_context *pCtx,
11843 u32 enc,
11844 int eType,
11845 u8 *pData,
11846 int nData
11847 ){
11848 if( eType>=0 && dbdataValueBytes(eType)<=nData ){
11849 switch( eType ){
11850 case 0:
11851 case 10:
@@ -12277,11 +12277,11 @@
12277 sqlite3_result_int(ctx, pCsr->iField);
12278 break;
12279 case DBDATA_COLUMN_VALUE: {
12280 if( pCsr->iField<0 ){
12281 sqlite3_result_int64(ctx, pCsr->iIntkey);
12282 }else{
12283 sqlite3_int64 iType;
12284 dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
12285 dbdataValue(
12286 ctx, pCsr->enc, iType, pCsr->pPtr,
12287 &pCsr->pRec[pCsr->nRec] - pCsr->pPtr
12288
--- extsrc/shell.c
+++ extsrc/shell.c
@@ -11841,11 +11841,11 @@
11841 static void dbdataValue(
11842 sqlite3_context *pCtx,
11843 u32 enc,
11844 int eType,
11845 u8 *pData,
11846 sqlite3_int64 nData
11847 ){
11848 if( eType>=0 && dbdataValueBytes(eType)<=nData ){
11849 switch( eType ){
11850 case 0:
11851 case 10:
@@ -12277,11 +12277,11 @@
12277 sqlite3_result_int(ctx, pCsr->iField);
12278 break;
12279 case DBDATA_COLUMN_VALUE: {
12280 if( pCsr->iField<0 ){
12281 sqlite3_result_int64(ctx, pCsr->iIntkey);
12282 }else if( &pCsr->pRec[pCsr->nRec] >= pCsr->pPtr ){
12283 sqlite3_int64 iType;
12284 dbdataGetVarintU32(pCsr->pHdrPtr, &iType);
12285 dbdataValue(
12286 ctx, pCsr->enc, iType, pCsr->pPtr,
12287 &pCsr->pRec[pCsr->nRec] - pCsr->pPtr
12288
M extsrc/sqlite3.c
+14 -7
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -452,11 +452,11 @@
452452
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453453
 ** [sqlite_version()] and [sqlite_source_id()].
454454
 */
455455
 #define SQLITE_VERSION "3.40.0"
456456
 #define SQLITE_VERSION_NUMBER 3040000
457
-#define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0"
457
+#define SQLITE_SOURCE_ID "2022-11-16 12:10:08 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318"
458458
459459
 /*
460460
 ** CAPI3REF: Run-Time Library Version Numbers
461461
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462462
 **
@@ -2643,10 +2643,11 @@
26432643
 ** deliberately corrupt the database file are disabled. The disabled
26442644
 ** features include but are not limited to the following:
26452645
 ** <ul>
26462646
 ** <li> The [PRAGMA writable_schema=ON] statement.
26472647
 ** <li> The [PRAGMA journal_mode=OFF] statement.
2648
+** <li> The [PRAGMA schema_version=N] statement.
26482649
 ** <li> Writes to the [sqlite_dbpage] virtual table.
26492650
 ** <li> Direct writes to [shadow tables].
26502651
 ** </ul>
26512652
 ** </dd>
26522653
 **
@@ -32534,14 +32535,14 @@
3253432535
3253532536
3253632537
 /* The RFC-7539 ChaCha20 block function
3253732538
 */
3253832539
 #define ROTL(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
32539
-#define QR(a, b, c, d) ( \
32540
- a += b, d ^= a, d = ROTL(d,16), \
32541
- c += d, b ^= c, b = ROTL(b,12), \
32542
- a += b, d ^= a, d = ROTL(d, 8), \
32540
+#define QR(a, b, c, d) ( \
32541
+ a += b, d ^= a, d = ROTL(d,16), \
32542
+ c += d, b ^= c, b = ROTL(b,12), \
32543
+ a += b, d ^= a, d = ROTL(d, 8), \
3254332544
 c += d, b ^= c, b = ROTL(b, 7))
3254432545
 static void chacha_block(u32 *out, const u32 *in){
3254532546
 int i;
3254632547
 u32 x[16];
3254732548
 memcpy(x, in, 64);
@@ -135517,10 +135518,15 @@
135517135518
 aOp[0].p1 = iDb;
135518135519
 aOp[1].p1 = iDb;
135519135520
 aOp[1].p2 = iCookie;
135520135521
 aOp[1].p3 = sqlite3Atoi(zRight);
135521135522
 aOp[1].p5 = 1;
135523
+ if( iCookie==BTREE_SCHEMA_VERSION && (db->flags & SQLITE_Defensive)!=0 ){
135524
+ /* Do not allow the use of PRAGMA schema_version=VALUE in defensive
135525
+ ** mode. Change the OP_SetCookie opcode into a no-op. */
135526
+ aOp[1].opcode = OP_Noop;
135527
+ }
135522135528
 }else{
135523135529
 /* Read the specified cookie value */
135524135530
 static const VdbeOpList readCookie[] = {
135525135531
 { OP_Transaction, 0, 0, 0}, /* 0 */
135526135532
 { OP_ReadCookie, 0, 1, 0}, /* 1 */
@@ -210520,11 +210526,11 @@
210520210526
210521210527
 if( p->rc==SQLITE_OK && rbuIsVacuum(p) ){
210522210528
 sqlite3_file_control(p->dbRbu, "main", SQLITE_FCNTL_RBUCNT, (void*)p);
210523210529
 if( p->zState==0 ){
210524210530
 const char *zFile = sqlite3_db_filename(p->dbRbu, "main");
210525
- p->zState = rbuMPrintf(p, "file://%s-vacuum?modeof=%s", zFile, zFile);
210531
+ p->zState = rbuMPrintf(p, "file:///%s-vacuum?modeof=%s", zFile, zFile);
210526210532
 }
210527210533
 }
210528210534
210529210535
 /* If using separate RBU and state databases, attach the state database to
210530210536
 ** the RBU db handle now. */
@@ -235191,10 +235197,11 @@
235191235197
 i64 iRowid = fts5MultiIterRowid(pIter);
235192235198
 char *z = (char*)fts5MultiIterTerm(pIter, &n);
235193235199
235194235200
 /* If this is a new term, query for it. Update cksum3 with the results. */
235195235201
 fts5TestTerm(p, &term, z, n, cksum2, &cksum3);
235202
+ if( p->rc ) break;
235196235203
235197235204
 if( eDetail==FTS5_DETAIL_NONE ){
235198235205
 if( 0==fts5MultiIterIsEmpty(p, pIter) ){
235199235206
 cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n);
235200235207
 }
@@ -238528,11 +238535,11 @@
238528238535
 int nArg, /* Number of args */
238529238536
 sqlite3_value **apUnused /* Function arguments */
238530238537
 ){
238531238538
 assert( nArg==0 );
238532238539
 UNUSED_PARAM2(nArg, apUnused);
238533
- sqlite3_result_text(pCtx, "fts5: 2022-11-07 18:36:02 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e", -1, SQLITE_TRANSIENT);
238540
+ sqlite3_result_text(pCtx, "fts5: 2022-11-16 12:10:08 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318", -1, SQLITE_TRANSIENT);
238534238541
 }
238535238542
238536238543
 /*
238537238544
 ** Return true if zName is the extension on one of the shadow tables used
238538238545
 ** by this module.
238539238546
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -452,11 +452,11 @@
452 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453 ** [sqlite_version()] and [sqlite_source_id()].
454 */
455 #define SQLITE_VERSION "3.40.0"
456 #define SQLITE_VERSION_NUMBER 3040000
457 #define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0"
458
459 /*
460 ** CAPI3REF: Run-Time Library Version Numbers
461 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462 **
@@ -2643,10 +2643,11 @@
2643 ** deliberately corrupt the database file are disabled. The disabled
2644 ** features include but are not limited to the following:
2645 ** <ul>
2646 ** <li> The [PRAGMA writable_schema=ON] statement.
2647 ** <li> The [PRAGMA journal_mode=OFF] statement.
 
2648 ** <li> Writes to the [sqlite_dbpage] virtual table.
2649 ** <li> Direct writes to [shadow tables].
2650 ** </ul>
2651 ** </dd>
2652 **
@@ -32534,14 +32535,14 @@
32534
32535
32536 /* The RFC-7539 ChaCha20 block function
32537 */
32538 #define ROTL(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
32539 #define QR(a, b, c, d) ( \
32540 a += b, d ^= a, d = ROTL(d,16), \
32541 c += d, b ^= c, b = ROTL(b,12), \
32542 a += b, d ^= a, d = ROTL(d, 8), \
32543 c += d, b ^= c, b = ROTL(b, 7))
32544 static void chacha_block(u32 *out, const u32 *in){
32545 int i;
32546 u32 x[16];
32547 memcpy(x, in, 64);
@@ -135517,10 +135518,15 @@
135517 aOp[0].p1 = iDb;
135518 aOp[1].p1 = iDb;
135519 aOp[1].p2 = iCookie;
135520 aOp[1].p3 = sqlite3Atoi(zRight);
135521 aOp[1].p5 = 1;
 
 
 
 
 
135522 }else{
135523 /* Read the specified cookie value */
135524 static const VdbeOpList readCookie[] = {
135525 { OP_Transaction, 0, 0, 0}, /* 0 */
135526 { OP_ReadCookie, 0, 1, 0}, /* 1 */
@@ -210520,11 +210526,11 @@
210520
210521 if( p->rc==SQLITE_OK && rbuIsVacuum(p) ){
210522 sqlite3_file_control(p->dbRbu, "main", SQLITE_FCNTL_RBUCNT, (void*)p);
210523 if( p->zState==0 ){
210524 const char *zFile = sqlite3_db_filename(p->dbRbu, "main");
210525 p->zState = rbuMPrintf(p, "file://%s-vacuum?modeof=%s", zFile, zFile);
210526 }
210527 }
210528
210529 /* If using separate RBU and state databases, attach the state database to
210530 ** the RBU db handle now. */
@@ -235191,10 +235197,11 @@
235191 i64 iRowid = fts5MultiIterRowid(pIter);
235192 char *z = (char*)fts5MultiIterTerm(pIter, &n);
235193
235194 /* If this is a new term, query for it. Update cksum3 with the results. */
235195 fts5TestTerm(p, &term, z, n, cksum2, &cksum3);
 
235196
235197 if( eDetail==FTS5_DETAIL_NONE ){
235198 if( 0==fts5MultiIterIsEmpty(p, pIter) ){
235199 cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n);
235200 }
@@ -238528,11 +238535,11 @@
238528 int nArg, /* Number of args */
238529 sqlite3_value **apUnused /* Function arguments */
238530 ){
238531 assert( nArg==0 );
238532 UNUSED_PARAM2(nArg, apUnused);
238533 sqlite3_result_text(pCtx, "fts5: 2022-11-07 18:36:02 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e", -1, SQLITE_TRANSIENT);
238534 }
238535
238536 /*
238537 ** Return true if zName is the extension on one of the shadow tables used
238538 ** by this module.
238539
--- extsrc/sqlite3.c
+++ extsrc/sqlite3.c
@@ -452,11 +452,11 @@
452 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
453 ** [sqlite_version()] and [sqlite_source_id()].
454 */
455 #define SQLITE_VERSION "3.40.0"
456 #define SQLITE_VERSION_NUMBER 3040000
457 #define SQLITE_SOURCE_ID "2022-11-16 12:10:08 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318"
458
459 /*
460 ** CAPI3REF: Run-Time Library Version Numbers
461 ** KEYWORDS: sqlite3_version sqlite3_sourceid
462 **
@@ -2643,10 +2643,11 @@
2643 ** deliberately corrupt the database file are disabled. The disabled
2644 ** features include but are not limited to the following:
2645 ** <ul>
2646 ** <li> The [PRAGMA writable_schema=ON] statement.
2647 ** <li> The [PRAGMA journal_mode=OFF] statement.
2648 ** <li> The [PRAGMA schema_version=N] statement.
2649 ** <li> Writes to the [sqlite_dbpage] virtual table.
2650 ** <li> Direct writes to [shadow tables].
2651 ** </ul>
2652 ** </dd>
2653 **
@@ -32534,14 +32535,14 @@
32535
32536
32537 /* The RFC-7539 ChaCha20 block function
32538 */
32539 #define ROTL(a,b) (((a) << (b)) | ((a) >> (32 - (b))))
32540 #define QR(a, b, c, d) ( \
32541 a += b, d ^= a, d = ROTL(d,16), \
32542 c += d, b ^= c, b = ROTL(b,12), \
32543 a += b, d ^= a, d = ROTL(d, 8), \
32544 c += d, b ^= c, b = ROTL(b, 7))
32545 static void chacha_block(u32 *out, const u32 *in){
32546 int i;
32547 u32 x[16];
32548 memcpy(x, in, 64);
@@ -135517,10 +135518,15 @@
135518 aOp[0].p1 = iDb;
135519 aOp[1].p1 = iDb;
135520 aOp[1].p2 = iCookie;
135521 aOp[1].p3 = sqlite3Atoi(zRight);
135522 aOp[1].p5 = 1;
135523 if( iCookie==BTREE_SCHEMA_VERSION && (db->flags & SQLITE_Defensive)!=0 ){
135524 /* Do not allow the use of PRAGMA schema_version=VALUE in defensive
135525 ** mode. Change the OP_SetCookie opcode into a no-op. */
135526 aOp[1].opcode = OP_Noop;
135527 }
135528 }else{
135529 /* Read the specified cookie value */
135530 static const VdbeOpList readCookie[] = {
135531 { OP_Transaction, 0, 0, 0}, /* 0 */
135532 { OP_ReadCookie, 0, 1, 0}, /* 1 */
@@ -210520,11 +210526,11 @@
210526
210527 if( p->rc==SQLITE_OK && rbuIsVacuum(p) ){
210528 sqlite3_file_control(p->dbRbu, "main", SQLITE_FCNTL_RBUCNT, (void*)p);
210529 if( p->zState==0 ){
210530 const char *zFile = sqlite3_db_filename(p->dbRbu, "main");
210531 p->zState = rbuMPrintf(p, "file:///%s-vacuum?modeof=%s", zFile, zFile);
210532 }
210533 }
210534
210535 /* If using separate RBU and state databases, attach the state database to
210536 ** the RBU db handle now. */
@@ -235191,10 +235197,11 @@
235197 i64 iRowid = fts5MultiIterRowid(pIter);
235198 char *z = (char*)fts5MultiIterTerm(pIter, &n);
235199
235200 /* If this is a new term, query for it. Update cksum3 with the results. */
235201 fts5TestTerm(p, &term, z, n, cksum2, &cksum3);
235202 if( p->rc ) break;
235203
235204 if( eDetail==FTS5_DETAIL_NONE ){
235205 if( 0==fts5MultiIterIsEmpty(p, pIter) ){
235206 cksum2 ^= sqlite3Fts5IndexEntryCksum(iRowid, 0, 0, -1, z, n);
235207 }
@@ -238528,11 +238535,11 @@
238535 int nArg, /* Number of args */
238536 sqlite3_value **apUnused /* Function arguments */
238537 ){
238538 assert( nArg==0 );
238539 UNUSED_PARAM2(nArg, apUnused);
238540 sqlite3_result_text(pCtx, "fts5: 2022-11-16 12:10:08 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318", -1, SQLITE_TRANSIENT);
238541 }
238542
238543 /*
238544 ** Return true if zName is the extension on one of the shadow tables used
238545 ** by this module.
238546
M extsrc/sqlite3.h
+2 -1
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146146
 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147147
 ** [sqlite_version()] and [sqlite_source_id()].
148148
 */
149149
 #define SQLITE_VERSION "3.40.0"
150150
 #define SQLITE_VERSION_NUMBER 3040000
151
-#define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0"
151
+#define SQLITE_SOURCE_ID "2022-11-16 12:10:08 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318"
152152
153153
 /*
154154
 ** CAPI3REF: Run-Time Library Version Numbers
155155
 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156156
 **
@@ -2337,10 +2337,11 @@
23372337
 ** deliberately corrupt the database file are disabled. The disabled
23382338
 ** features include but are not limited to the following:
23392339
 ** <ul>
23402340
 ** <li> The [PRAGMA writable_schema=ON] statement.
23412341
 ** <li> The [PRAGMA journal_mode=OFF] statement.
2342
+** <li> The [PRAGMA schema_version=N] statement.
23422343
 ** <li> Writes to the [sqlite_dbpage] virtual table.
23432344
 ** <li> Direct writes to [shadow tables].
23442345
 ** </ul>
23452346
 ** </dd>
23462347
 **
23472348
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.40.0"
150 #define SQLITE_VERSION_NUMBER 3040000
151 #define SQLITE_SOURCE_ID "2022-11-07 19:40:20 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
@@ -2337,10 +2337,11 @@
2337 ** deliberately corrupt the database file are disabled. The disabled
2338 ** features include but are not limited to the following:
2339 ** <ul>
2340 ** <li> The [PRAGMA writable_schema=ON] statement.
2341 ** <li> The [PRAGMA journal_mode=OFF] statement.
 
2342 ** <li> Writes to the [sqlite_dbpage] virtual table.
2343 ** <li> Direct writes to [shadow tables].
2344 ** </ul>
2345 ** </dd>
2346 **
2347
--- extsrc/sqlite3.h
+++ extsrc/sqlite3.h
@@ -146,11 +146,11 @@
146 ** [sqlite3_libversion_number()], [sqlite3_sourceid()],
147 ** [sqlite_version()] and [sqlite_source_id()].
148 */
149 #define SQLITE_VERSION "3.40.0"
150 #define SQLITE_VERSION_NUMBER 3040000
151 #define SQLITE_SOURCE_ID "2022-11-16 12:10:08 89c459e766ea7e9165d0beeb124708b955a4950d0f4792f457465d71b158d318"
152
153 /*
154 ** CAPI3REF: Run-Time Library Version Numbers
155 ** KEYWORDS: sqlite3_version sqlite3_sourceid
156 **
@@ -2337,10 +2337,11 @@
2337 ** deliberately corrupt the database file are disabled. The disabled
2338 ** features include but are not limited to the following:
2339 ** <ul>
2340 ** <li> The [PRAGMA writable_schema=ON] statement.
2341 ** <li> The [PRAGMA journal_mode=OFF] statement.
2342 ** <li> The [PRAGMA schema_version=N] statement.
2343 ** <li> Writes to the [sqlite_dbpage] virtual table.
2344 ** <li> Direct writes to [shadow tables].
2345 ** </ul>
2346 ** </dd>
2347 **
2348

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button