aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2017-01-02 23:18:35 +0000
committerdrh <drh@noemail.net>2017-01-02 23:18:35 +0000
commit3f50bb84f55e33df406bc69d2369a4bec223ef4e (patch)
tree692f7c4d1bee85581bfa8907284ded5c2e514ef5 /src/expr.c
parent47073f62bf607208b00d19cd9059f2acb275778e (diff)
downloadsqlite-3f50bb84f55e33df406bc69d2369a4bec223ef4e.tar.gz
sqlite-3f50bb84f55e33df406bc69d2369a4bec223ef4e.zip
Put an ALWAYS() on an unreachable branch in the sqlite3ExprListDup() routine.
FossilOrigin-Name: 2caaaab5e07f6b76d66fbe4e93a4b956937427d8
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c
index ebc9ca6b0..072c42078 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1311,6 +1311,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
Expr *pOldExpr = pOldItem->pExpr;
Expr *pNewExpr;
pItem->pExpr = sqlite3ExprDup(db, pOldExpr, flags);
+ assert( pItem->pExpr==0 || db->mallocFailed==0 );
if( pOldExpr
&& pOldExpr->op==TK_SELECT_COLUMN
&& (pNewExpr = pItem->pExpr)!=0
@@ -1319,7 +1320,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
if( pNewExpr->iColumn==0 ){
assert( pOldExpr->pLeft==pOldExpr->pRight );
pNewExpr->pLeft = pNewExpr->pRight;
- }else if( pItem[-1].pExpr!=0 ){
+ }else if( ALWAYS(pItem[-1].pExpr!=0) ){
pNewExpr->pLeft = pItem[-1].pExpr->pLeft;
}
}