/ Check-in [bdc50d8d]
Login

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

Overview
Comment:Remove a NEVER macro for a condition that may be true as of [a47efb7c]. Problem reported by OSSFuzz.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: bdc50d8d127266d02b291f6bfcd4e35eb07994ce23987d6e3921124cd881929a
User & Date: dan 2017-04-21 17:03:32
Context
2017-04-22
00:20
Fix an assertion fault found by OSSFuzz. check-in: e39769f4 user: drh tags: trunk
2017-04-21
17:03
Remove a NEVER macro for a condition that may be true as of [a47efb7c]. Problem reported by OSSFuzz. check-in: bdc50d8d user: dan tags: trunk
16:04
Fix an FTS5 bug that could cause a prefix-query without a prefix-index on a database that contains delete-markers to return extra, non-matching, rows. check-in: 840042cb user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/vtab.c.

  1049   1049     unsigned char *z;
  1050   1050   
  1051   1051   
  1052   1052     /* Check to see the left operand is a column in a virtual table */
  1053   1053     if( NEVER(pExpr==0) ) return pDef;
  1054   1054     if( pExpr->op!=TK_COLUMN ) return pDef;
  1055   1055     pTab = pExpr->pTab;
  1056         -  if( NEVER(pTab==0) ) return pDef;
         1056  +  if( pTab==0 ) return pDef;
  1057   1057     if( !IsVirtual(pTab) ) return pDef;
  1058   1058     pVtab = sqlite3GetVTable(db, pTab)->pVtab;
  1059   1059     assert( pVtab!=0 );
  1060   1060     assert( pVtab->pModule!=0 );
  1061   1061     pMod = (sqlite3_module *)pVtab->pModule;
  1062   1062     if( pMod->xFindFunction==0 ) return pDef;
  1063   1063    

Changes to test/indexexpr2.test.

    27     27   do_execsql_test 1.1 {
    28     28     SELECT 'TWOX' == (b || 'x') FROM t1 WHERE (b || 'x')>'onex'
    29     29   } {0 0}
    30     30   
    31     31   do_execsql_test 1.2 {
    32     32     SELECT 'TWOX' == (b || 'x') COLLATE nocase  FROM t1 WHERE (b || 'x')>'onex'
    33     33   } {0 1}
           34  +
           35  +do_execsql_test 2.0 {
           36  +  CREATE INDEX i2 ON t1(a+1);
           37  +}
           38  +
           39  +do_execsql_test 2.1 {
           40  +  SELECT a+1, quote(a+1) FROM t1 ORDER BY 1;
           41  +} {2 2 3 3 4 4}
    34     42   
    35     43   finish_test
    36     44