database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-08 03:22:21 +03:00
Code Activity

Fix problems in the handling of malloc failures. (CVS 1882)

Browse Source 
FossilOrigin-Name: 81d91d14cf2352fc7981b361ac9af99b3cbbc9e8
This commit is contained in:
drh
2004-08-08 23:39:19 +00:00
parent 4c755c0f53
commit 71c697ef4d
9 changed files with 48 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/expr.c
View File

@@ -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.154 2004/08/08 20:22:17 drh Exp $
** $Id: expr.c,v 1.155 2004/08/08 23:39:19 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -226,8 +226,7 @@ Expr *sqlite3Expr(int op, Expr *pLeft, Expr *pRight, Token *pToken){
void sqlite3ExprSpan(Expr *pExpr, Token *pLeft, Token *pRight){
assert( pRight!=0 );
assert( pLeft!=0 );
/* Note: pExpr might be NULL due to a prior malloc failure */
if( pExpr && pRight->z && pLeft->z ){
if( !sqlite3_malloc_failed && pRight->z && pLeft->z ){
if( pLeft->dyn==0 && pRight->dyn==0 ){
pExpr->span.z = pLeft->z;
pExpr->span.n = pRight->n + Addr(pRight->z) - Addr(pLeft->z);