diff options
| author | drh <drh@noemail.net> | 2015-04-17 15:16:58 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-04-17 15:16:58 +0000 |
| commit | b8289a8b009c6847340e55bf3ad595cbbdc6fa23 (patch) | |
| tree | ca2a13e55943e631896f9534b7fe8d53743b841d /src | |
| parent | 268e72f936f49fba9660e52d781085f515f2cf45 (diff) | |
| download | sqlite-b8289a8b009c6847340e55bf3ad595cbbdc6fa23.tar.gz sqlite-b8289a8b009c6847340e55bf3ad595cbbdc6fa23.zip | |
Fix a faulty assert() in sqlite3SelectNew().
FossilOrigin-Name: 620d19c3b462f5c4763ebd26513321431f21dd72
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/select.c b/src/select.c index e4e5d6da8..fc5740e80 100644 --- a/src/select.c +++ b/src/select.c @@ -111,7 +111,6 @@ Select *sqlite3SelectNew( Select standin; sqlite3 *db = pParse->db; pNew = sqlite3DbMallocZero(db, sizeof(*pNew) ); - assert( db->mallocFailed || !pOffset || pLimit ); /* OFFSET implies LIMIT */ if( pNew==0 ){ assert( db->mallocFailed ); pNew = &standin; @@ -131,7 +130,7 @@ Select *sqlite3SelectNew( pNew->op = TK_SELECT; pNew->pLimit = pLimit; pNew->pOffset = pOffset; - assert( pOffset==0 || pLimit!=0 ); + assert( pOffset==0 || pLimit!=0 || pParse->nErr>0 || db->mallocFailed!=0 ); pNew->addrOpenEphm[0] = -1; pNew->addrOpenEphm[1] = -1; if( db->mallocFailed ) { |