diff options
| author | danielk1977 <danielk1977@noemail.net> | 2009-04-28 12:08:15 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2009-04-28 12:08:15 +0000 |
| commit | c1f4a19bfaf20ecc3820972ebf4d0cee5a8e842f (patch) | |
| tree | 6da9f9858b492461f87086062beebd0b401610ae /src/expr.c | |
| parent | f0d0a8dc4ad5a83d5e41f9376a7e0bb2236d66b0 (diff) | |
| download | sqlite-c1f4a19bfaf20ecc3820972ebf4d0cee5a8e842f.tar.gz sqlite-c1f4a19bfaf20ecc3820972ebf4d0cee5a8e842f.zip | |
Another fix to the same assert as in (6555). It can also fail after a malloc error. (CVS 6556)
FossilOrigin-Name: e096f90a57f0e0d1dbeaafc72762035ca55ab803
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/expr.c b/src/expr.c index 068fd780f..ff5c4bd51 100644 --- a/src/expr.c +++ b/src/expr.c @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id: expr.c,v 1.429 2009/04/28 11:10:39 danielk1977 Exp $ +** $Id: expr.c,v 1.430 2009/04/28 12:08:15 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -2575,7 +2575,8 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){ }else{ sqlite3VdbeAddOp2(v, OP_Null, 0, target); } - assert( pParse->nErr>0 || pParse->iCacheLevel==iCacheLevel ); + assert( db->mallocFailed || pParse->nErr>0 + || pParse->iCacheLevel==iCacheLevel ); sqlite3VdbeResolveLabel(v, endLabel); break; } |