database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

The previous OOM fix was bad. Back it out and replace it with a better one.

Browse Source 
FossilOrigin-Name: 1e3bc3698a4b779e6af8e3c727929c4dbddf3edb
This commit is contained in:
drh
2016-08-24 00:51:48 +00:00
parent 894241c847
commit ac6b47d164
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/expr.c
View File

@@ -1952,6 +1952,7 @@ static Select *isCandidateForInOpt(Expr *pX){
assert( pTab->pSelect==0 ); /* FROM clause is not a view */
if( IsVirtual(pTab) ) return 0; /* FROM clause not a virtual table */
pEList = p->pEList;
assert( pEList!=0 );
/* All SELECT results must be columns. */
for(i=0; i<pEList->nExpr; i++){
@@ -2103,7 +2104,6 @@ int sqlite3FindInIndex(
int mustBeUnique; /* True if RHS must be unique */
Vdbe *v = sqlite3GetVdbe(pParse); /* Virtual machine being coded */
if( pParse->db->mallocFailed ) return IN_INDEX_NOOP;
assert( pX->op==TK_IN );
mustBeUnique = (inFlags & IN_INDEX_LOOP)!=0;