diff options
| author | drh <drh@noemail.net> | 2009-05-28 14:34:49 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-05-28 14:34:49 +0000 |
| commit | 2c220455b91feef421df28bdcac2efe6d25d6a75 (patch) | |
| tree | 694d3cc745d4b3adedff858f56119b9b4755c413 /src/resolve.c | |
| parent | 0b0745ae37a57b2473f953acec01383c84f2232d (diff) | |
| download | sqlite-2c220455b91feef421df28bdcac2efe6d25d6a75.tar.gz sqlite-2c220455b91feef421df28bdcac2efe6d25d6a75.zip | |
Fix a NULL pointer dereference following an OOM error in the column name
resolver. (CVS 6685)
FossilOrigin-Name: 3b46142532934d17aa136c2e56e58e7828df0f54
Diffstat (limited to 'src/resolve.c')
| -rw-r--r-- | src/resolve.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/resolve.c b/src/resolve.c index b536dcfe0..dc750b1e9 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -14,7 +14,7 @@ ** resolve all identifiers by associating them with a particular ** table and column. ** -** $Id: resolve.c,v 1.25 2009/05/28 12:49:53 drh Exp $ +** $Id: resolve.c,v 1.26 2009/05/28 14:34:50 drh Exp $ */ #include "sqliteInt.h" #include <stdlib.h> @@ -73,6 +73,7 @@ static void resolveAlias( pDup->iTable = pEList->a[iCol].iAlias; }else if( ExprHasProperty(pOrig, EP_IntValue) || pOrig->u.zToken==0 ){ pDup = sqlite3ExprDup(db, pOrig, 0); + if( pDup==0 ) return; }else{ char *zToken = pOrig->u.zToken; pOrig->u.zToken = 0; |