diff options
| author | drh <drh@noemail.net> | 2017-05-06 18:09:36 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2017-05-06 18:09:36 +0000 |
| commit | ffe280596e90dcde7f319f66109aab779f0300ef (patch) | |
| tree | 21eab6cc3309a0cfa3aa9ef61030627207cfd185 /src/expr.c | |
| parent | f8a2e8c2d29d1e3953511425cd81653be647d54f (diff) | |
| download | sqlite-ffe280596e90dcde7f319f66109aab779f0300ef.tar.gz sqlite-ffe280596e90dcde7f319f66109aab779f0300ef.zip | |
Fix an obscure assertion fault that can follow an OOM. The problem
was introduced by check-in [a1cf44763277b6c7].
FossilOrigin-Name: 04e7e5650efffdce759b46999beb67c250af6cf394a7779ab861f210a84c134d
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index a79b0b749..b5d4ed1f9 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1550,7 +1550,7 @@ ExprList *sqlite3ExprListAppendVector( } } - if( pExpr->op==TK_SELECT && pList ){ + if( !db->mallocFailed && pExpr->op==TK_SELECT && ALWAYS(pList!=0) ){ Expr *pFirst = pList->a[iFirst].pExpr; assert( pFirst!=0 ); assert( pFirst->op==TK_SELECT_COLUMN ); |