diff options
| author | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-12-02 20:40:26 +0000 |
| commit | 1bb15fc973f5b1b472897095f629abcc663bd453 (patch) | |
| tree | 4eda31846a69354eb5ba5ff9dc91602a18d942ac /src/resolve.c | |
| parent | 769dc6e2a22b3104583ad357b01f31a22e146a5c (diff) | |
| parent | f7ce4291a94573cdb04e5f3fcf59ed9e69226479 (diff) | |
| download | sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.tar.gz sqlite-1bb15fc973f5b1b472897095f629abcc663bd453.zip | |
Merge recent enhancements from trunk.
FossilOrigin-Name: d1a1278d7f3306536dc9cbd8fb300898f1e373e8
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/resolve.c b/src/resolve.c index ac1706b59..b3e887778 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -1423,9 +1423,10 @@ int sqlite3ResolveExprListNames( ExprList *pList /* The expression list to be analyzed. */ ){ int i; - assert( pList!=0 ); - for(i=0; i<pList->nExpr; i++){ - if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; + if( pList ){ + for(i=0; i<pList->nExpr; i++){ + if( sqlite3ResolveExprNames(pNC, pList->a[i].pExpr) ) return WRC_Abort; + } } return WRC_Continue; } |