database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-01 06:27:03 +03:00
Code Activity

Fix another case where malformed utf-8 was being mishandled in fts5. Fix for [df46a6f3].

Browse Source 
FossilOrigin-Name: 1c0a05b09a97e6e2e9b11c31ed6ec7e6484686614b587ebfd0cfe27d973ba461
This commit is contained in:
dan
2019-12-24 16:20:05 +00:00
parent 84d17bdaa7
commit 3fee9de239
4 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/fts5/fts5_index.c
View File

@ -5318,10 +5318,13 @@ int sqlite3Fts5IndexCharlenToBytelen(
for(i=0; i<nChar; i++){
if( n>=nByte ) return 0; /* Input contains fewer than nChar chars */
if( (unsigned char)p[n++]>=0xc0 ){
if( n>=nByte ) break;
if( n>=nByte ) return 0;
while( (p[n] & 0xc0)==0x80 ){
n++;
if( n>=nByte ) break;
if( n>=nByte ){
if( i+1==nChar ) break;
return 0;
}
}
}
}

17
ext/fts5/test/fts5misc.test
View File

@ -266,5 +266,22 @@ do_execsql_test 10.2 {
INSERT INTO vt1(vt1) VALUES('integrity-check');
}
#-------------------------------------------------------------------------
#
reset_db
do_execsql_test 11.0 {
CREATE VIRTUAL TABLE vt0 USING fts5(
c0, prefix = 71, tokenize = "porter ascii", prefix = 9
);
} {}
do_execsql_test 11.1 {
BEGIN;
INSERT INTO vt0(c0) VALUES (x'e8');
}
do_execsql_test 11.2 {
INSERT INTO vt0(vt0) VALUES('integrity-check');
}
finish_test