diff options
author | Ilia Alshanetsky <iliaa@php.net> | 2005-09-07 15:10:15 +0000 |
---|---|---|
committer | Ilia Alshanetsky <iliaa@php.net> | 2005-09-07 15:10:15 +0000 |
commit | 2195f7ec74c445404dd5d38378dadc956cf6fe60 (patch) | |
tree | 528f29ea6e1aa1986ac01f66f35ec783dec07885 /ext/sqlite/libsqlite/src/expr.c | |
parent | 49cf0eff6a9880d751c7c4be872d3612969bc995 (diff) | |
download | php-git-2195f7ec74c445404dd5d38378dadc956cf6fe60.tar.gz |
Upgraded sqlite2 lib to 2.8.16
Diffstat (limited to 'ext/sqlite/libsqlite/src/expr.c')
-rw-r--r-- | ext/sqlite/libsqlite/src/expr.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ext/sqlite/libsqlite/src/expr.c b/ext/sqlite/libsqlite/src/expr.c index 44c0f6967a..86346fa5d9 100644 --- a/ext/sqlite/libsqlite/src/expr.c +++ b/ext/sqlite/libsqlite/src/expr.c @@ -124,7 +124,7 @@ Expr *sqliteExprDup(Expr *p){ if( pNew==0 ) return 0; memcpy(pNew, p, sizeof(*pNew)); if( p->token.z!=0 ){ - pNew->token.z = sqliteStrDup(p->token.z); + pNew->token.z = sqliteStrNDup(p->token.z, p->token.n); pNew->token.dyn = 1; }else{ assert( pNew->token.z==0 ); @@ -155,7 +155,10 @@ ExprList *sqliteExprListDup(ExprList *p){ if( pNew==0 ) return 0; pNew->nExpr = pNew->nAlloc = p->nExpr; pNew->a = pItem = sqliteMalloc( p->nExpr*sizeof(p->a[0]) ); - if( pItem==0 ) return 0; /* Leaks memory after a malloc failure */ + if( pItem==0 ){ + sqliteFree(pNew); + return 0; + } for(i=0; i<p->nExpr; i++, pItem++){ Expr *pNewExpr, *pOldExpr; pItem->pExpr = pNewExpr = sqliteExprDup(pOldExpr = p->a[i].pExpr); |