diff options
| author | danielk1977 <danielk1977@noemail.net> | 2008-11-21 09:43:20 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2008-11-21 09:43:20 +0000 |
| commit | 956f4319be421d6de3ade06fcb14f391d4be3be9 (patch) | |
| tree | e9918f0c4297230f18eca6324340db2f4bfda58c /src | |
| parent | b247c21c1550e2ab8aee311e001e25addf357415 (diff) | |
| download | sqlite-956f4319be421d6de3ade06fcb14f391d4be3be9.tar.gz sqlite-956f4319be421d6de3ade06fcb14f391d4be3be9.zip | |
Fix an assert() failure that can occur after an OOM error. (CVS 5939)
FossilOrigin-Name: 4c765758c18d7aeffe6e1cf658d2847f9460a956
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/select.c b/src/select.c index 22bdfd23a..ad22bf8b7 100644 --- a/src/select.c +++ b/src/select.c @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id: select.c,v 1.486 2008/11/19 09:05:27 danielk1977 Exp $ +** $Id: select.c,v 1.487 2008/11/21 09:43:20 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -3538,7 +3538,7 @@ int sqlite3Select( p->selFlags &= ~SF_Distinct; } sqlite3SelectPrep(pParse, p, 0); - if( pParse->nErr ){ + if( pParse->nErr || db->mallocFailed ){ goto select_end; } p->pOrderBy = pOrderBy; |