diff options
| author | drh <drh@noemail.net> | 2016-01-11 13:10:41 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-01-11 13:10:41 +0000 |
| commit | 604ce70448d0572477ad25bb3510b1dc3f2ad967 (patch) | |
| tree | 5311ccb5ee4087afa2ee0b80dccad066cc20a918 /src/expr.c | |
| parent | f56a2a07ff4f9156640844f53e5ae3668e995b89 (diff) | |
| parent | 2fca70569d8db348a85c059151b2af5d20527302 (diff) | |
| download | sqlite-604ce70448d0572477ad25bb3510b1dc3f2ad967.tar.gz sqlite-604ce70448d0572477ad25bb3510b1dc3f2ad967.zip | |
Merge recent enhancements, and especially the WAL overwrite change, from trunk.
FossilOrigin-Name: c4a858b228a164be2f89f5b01833f0b5e0d7735b
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/expr.c b/src/expr.c index d8d36afa5..3be3bf52d 100644 --- a/src/expr.c +++ b/src/expr.c @@ -461,8 +461,9 @@ Expr *sqlite3ExprAlloc( assert( iValue>=0 ); } } - pNew = sqlite3DbMallocZero(db, sizeof(Expr)+nExtra); + pNew = sqlite3DbMallocRaw(db, sizeof(Expr)+nExtra); if( pNew ){ + memset(pNew, 0, sizeof(Expr)); pNew->op = (u8)op; pNew->iAgg = -1; if( pToken ){ |