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

Fix handling of an OOM error in the fts3 offsets() function. Fix a couple of snippet related test cases in e_fts3.test.

Browse Source 
FossilOrigin-Name: 14dc46a74aafe44c0bf7dffd26268395b2c5edb2
This commit is contained in:
dan
2010-01-09 07:33:54 +00:00
parent 819443e506
commit 1a54b8ecfa
4 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ext/fts3/fts3_snippet.c
View File

@ -908,9 +908,23 @@ void sqlite3Fts3Offsets(
rc = fts3ExprIterate(pCsr->pExpr, fts3ExprTermOffsetInit, (void *)&sCtx);
if( rc!=SQLITE_OK ) goto offsets_out;
/* Initialize a tokenizer iterator to iterate through column iCol. */
/* Retreive the text stored in column iCol. If an SQL NULL is stored
** in column iCol, jump immediately to the next iteration of the loop.
** If an OOM occurs while retrieving the data (this can happen if SQLite
** needs to transform the data from utf-16 to utf-8), return SQLITE_NOMEM
** to the caller.
*/
zDoc = (const char *)sqlite3_column_text(pCsr->pStmt, iCol+1);
nDoc = sqlite3_column_bytes(pCsr->pStmt, iCol+1);
if( zDoc==0 ){
if( sqlite3_column_type(pCsr->pStmt, iCol+1)==SQLITE_NULL ){
continue;
}
rc = SQLITE_NOMEM;
goto offsets_out;
}
/* Initialize a tokenizer iterator to iterate through column iCol. */
rc = pMod->xOpen(pTab->pTokenizer, zDoc, nDoc, &pC);
if( rc!=SQLITE_OK ) goto offsets_out;
pC->pTokenizer = pTab->pTokenizer;