diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/expr.c | 2 | ||||
| -rw-r--r-- | src/resolve.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c index c869d762f..140260931 100644 --- a/src/expr.c +++ b/src/expr.c @@ -99,7 +99,7 @@ Expr *sqlite3ExprAddCollateToken( if( pExpr==0 ) return 0; if( pExpr->op==TK_VECTOR ){ ExprList *pList = pExpr->x.pList; - if( pList!=0 ){ + if( ALWAYS(pList!=0) ){ int i; for(i=0; i<pList->nExpr; i++){ pList->a[i].pExpr = sqlite3ExprAddCollateToken(pParse,pList->a[i].pExpr, diff --git a/src/resolve.c b/src/resolve.c index 242aca1ae..4f5c5b961 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -106,10 +106,8 @@ static void resolveAlias( pExpr->flags |= EP_MemToken; } if( ExprHasProperty(pExpr, EP_WinFunc) ){ - if( pExpr->y.pWin!=0 ){ + if( ALWAYS(pExpr->y.pWin!=0) ){ pExpr->y.pWin->pOwner = pExpr; - }else{ - assert( db->mallocFailed ); } } sqlite3DbFree(db, pDup); |