mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an assert() in fts5 that may be true when dealing with corrupt records.

Browse Source 
FossilOrigin-Name: e8de2774463c07b76cd6b9a44ab32a583fe973f42a21b21af46fe82ab177c1b8
This commit is contained in:
dan 2023-04-17 10:39:51 +00:00
parent ae6f6ef3b0
commit 5c45a9fbaf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/fts5/fts5_index.c
View File

@ -4903,7 +4903,7 @@ static void fts5FlushSecureDelete(
fts5SecureDeleteIdxEntry(p, iSegid, pSeg->iLeafPgno);
}
assert( nPg>4 || fts5GetU16(aPg)==0 );
assert_nc( nPg>4 || fts5GetU16(aPg)==0 );
fts5DataWrite(p, FTS5_SEGMENT_ROWID(iSegid, pSeg->iLeafPgno), aPg, nPg);
sqlite3_free(aIdx);
}

12
manifest
View File

@ -1,5 +1,5 @@
C Change\sa\smemcpy()\sto\smemmove()\sin\snew\sfts5\scode.
D 2023-04-15T21:00:55.998
C Fix\san\sassert()\sin\sfts5\sthat\smay\sbe\strue\swhen\sdealing\swith\scorrupt\srecords.
D 2023-04-17T10:39:51.274
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -92,7 +92,7 @@ F ext/fts5/fts5_buffer.c 3001fbabb585d6de52947b44b455235072b741038391f830d6b7292
F ext/fts5/fts5_config.c 46af0b3c3c3f00bfc5bdd307434d7c5f0fa0678a034dd48345cd83b20068efbd
F ext/fts5/fts5_expr.c 48e8e45261c6030cf5c77f606217a22722b1a4d0b34e2ba6cbfc386581627989
F ext/fts5/fts5_hash.c d4fb70940359f2120ccd1de7ffe64cc3efe65de9e8995b822cd536ff64c96982
F ext/fts5/fts5_index.c 3d50e647b85c3563ba651eb241d7d7cbf52ebd0e8ec20480eaa8526ef67f964c
F ext/fts5/fts5_index.c 0fe4bf689b04c9a662bacd6936f7f07926eb61cf2024c8d4c8241d3bd3efe723
F ext/fts5/fts5_main.c b4dba04a36aaf9b8e8cef0100b6dbb422cc74753eacc11d6401cac7a87c0f38d
F ext/fts5/fts5_storage.c 76c6085239eb44424004c022e9da17a5ecd5aaec859fba90ad47d3b08f4c8082
F ext/fts5/fts5_tcl.c b1445cbe69908c411df8084a10b2485500ac70a9c747cdc8cda175a3da59d8ae
@ -2057,8 +2057,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 904be83d9f3dd4b21a3aa47dde337b5c045b925ffdde4bccd1f8e8fdbef68c18
R 42a22772112d38795073bd5ae2e55e02
P 8de4542553ae20947787b4daf5e88bbe69f815679960e700e19f9c1148234b08
R afbeea9d1c47bed909416ab95ba6cabc
U dan
Z 70b2307a762c2e6a4eaceb449e3ddd17
Z 13440c307a288857a675d3a4be022dc6
# Remove this line to create a well-formed Fossil manifest.

2
manifest.uuid
View File

@ -1 +1 @@
8de4542553ae20947787b4daf5e88bbe69f815679960e700e19f9c1148234b08
e8de2774463c07b76cd6b9a44ab32a583fe973f42a21b21af46fe82ab177c1b8