Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Avoid a NULL pointer dereference following an OOM while generating code for IN operators on virtual tables. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
c924008692e35f1f5144830af08d6de0 |
| User & Date: | drh 2016-03-07 19:08:27 |
Context
|
2016-03-07
| ||
| 20:14 | Update fts3/4 so that the 'merge=X,0' command merges X pages from all segments of the first level in the fts index that contains 2 or more segments. check-in: cddf69db user: dan tags: trunk | |
| 19:08 | Avoid a NULL pointer dereference following an OOM while generating code for IN operators on virtual tables. check-in: c9240086 user: drh tags: trunk | |
| 17:37 | Add the SQLITE_CONFIG_STMTJRNL_SPILL option for sqlite3_config(). check-in: b6c42024 user: drh tags: trunk | |
Changes
Changes to src/wherecode.c.
928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 |
/* Generate code that will continue to the next row if
** the IN constraint is not satisfied */
pCompare = sqlite3PExpr(pParse, TK_EQ, 0, 0, 0);
assert( pCompare!=0 || db->mallocFailed );
if( pCompare ){
pCompare->pLeft = pTerm->pExpr->pLeft;
pCompare->pRight = pRight = sqlite3Expr(db, TK_REGISTER, 0);
if( pRight ) pRight->iTable = iReg+j+2;
sqlite3ExprIfFalse(pParse, pCompare, pLevel->addrCont, 0);
pCompare->pLeft = 0;
sqlite3ExprDelete(db, pCompare);
}
}
}
sqlite3ReleaseTempRange(pParse, iReg, nConstraint+2);
sqlite3ExprCachePop(pParse);
|
> | | > |
928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 |
/* Generate code that will continue to the next row if
** the IN constraint is not satisfied */
pCompare = sqlite3PExpr(pParse, TK_EQ, 0, 0, 0);
assert( pCompare!=0 || db->mallocFailed );
if( pCompare ){
pCompare->pLeft = pTerm->pExpr->pLeft;
pCompare->pRight = pRight = sqlite3Expr(db, TK_REGISTER, 0);
if( pRight ){
pRight->iTable = iReg+j+2;
sqlite3ExprIfFalse(pParse, pCompare, pLevel->addrCont, 0);
}
pCompare->pLeft = 0;
sqlite3ExprDelete(db, pCompare);
}
}
}
sqlite3ReleaseTempRange(pParse, iReg, nConstraint+2);
sqlite3ExprCachePop(pParse);
|