SQLite: Check-in [31eed4f8]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Change FTS3 to detect when the RHS of the MATCH opertor encounters an OOM during string format conversion and report back an SQLITE_NOMEM error.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	31eed4f8f95f0799d634eccbd9e09cb58172d250
User & Date:	drh 2009-11-28 17:23:48

Context

2009-11-28
21:33		Updates to snippet() and offsets() functions of FTS3 so that they work sanely following an OOM fault. (check-in: b939a37a user: drh tags: trunk)
17:23		Change FTS3 to detect when the RHS of the MATCH opertor encounters an OOM during string format conversion and report back an SQLITE_NOMEM error. (check-in: 31eed4f8 user: drh tags: trunk)
17:07		Remove all benign OOM failure opportunities from the FTS3 hash table implementation. All OOM faults cause SQLITE_NOMEM to be returned. (check-in: 80754d38 user: drh tags: trunk)

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/fts3/fts3.c.

  1831   1831   
  1832   1832     if( idxNum==FTS3_DOCID_SEARCH ){
  1833   1833       rc = sqlite3_bind_value(pCsr->pStmt, 1, apVal[0]);
  1834   1834     }else if( idxNum!=FTS3_FULLSCAN_SEARCH ){
  1835   1835       int iCol = idxNum-FTS3_FULLTEXT_SEARCH;
  1836   1836       const char *zQuery = (const char *)sqlite3_value_text(apVal[0]);
  1837   1837   
         1838  +    if( zQuery==0 && sqlite3_value_type(apVal[0])!=SQLITE_NULL ){
         1839  +      return SQLITE_NOMEM;
         1840  +    }
  1838   1841       rc = sqlite3Fts3PendingTermsFlush(p);
  1839   1842       if( rc!=SQLITE_OK ) return rc;
  1840   1843   
  1841   1844       rc = sqlite3Fts3ExprParse(p->pTokenizer, p->azColumn, p->nColumn, 
  1842   1845           iCol, zQuery, -1, &pCsr->pExpr
  1843   1846       );
  1844   1847       if( rc!=SQLITE_OK ) return rc;