Fix a null-pointer dereference that follows a malloc() failure introduced in (3954...

FossilOrigin-Name: 251ba1981e32fb80818965ffe1ef455069e88abd

diff --git a/manifest b/manifest
index 0c39da4d66d5a6c9921c8a5a82fdbc8b1a980c98..0f972d471ce0eb3aa727f7d090843e078027667c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\samalgamation\sbuilder\sfor\sthe\slatest\schanges.\s(CVS\s3955)
-D 2007-05-08T17:59:42
+C Fix\sa\snull-pointer\sdereference\sthat\sfollows\sa\smalloc()\sfailure\sintroduced\sin\s(3954).\s(CVS\s3956)
+D 2007-05-08T18:04:46
 F Makefile.in 87b200ad9970907f76df734d29dff3d294c10935
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -70,7 +70,7 @@ F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675
 F src/date.c 263ef5b81b4ffdd80e8a830645798967bbbcfd05
 F src/delete.c 5c0d89b3ef7d48fe1f5124bfe8341f982747fe29
 F src/experimental.c 1b2d1a6cd62ecc39610e97670332ca073c50792b
-F src/expr.c d593bbac8ede96d9a8d1b67a05c948db84c46e99
+F src/expr.c eb91a54d0c2a3bebfcf91deda95508a188c2ed63
 F src/func.c 1598afc91529eed0307e9581f852779efbc8d12d
 F src/hash.c 67b23e14f0257b69a3e8aa663e4eeadc1a2b6fd5
 F src/hash.h 1b3f7e2609141fd571f62199fc38687d262e9564
@@ -486,7 +486,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P eeee6b71e5643511320cbe15bafa170cfd02877f
-R 01b9b636a7a301d253d538f5cdf5ad59
-U drh
-Z eb1e3110c9caaf6d8ddbfd28c7a99cd5
+P becd64d3615fc5738da4c70610d8849e0a70bed8
+R 985034783681e7cc54035c1eef2227e6
+U danielk1977
+Z 04c781546d358651729495f7a5fd6fe1

diff --git a/manifest.uuid b/manifest.uuid
index c92e0c3326868de9217a9102c3bfe5dfef48d9b2..d3dbba3f9d9585b434c8cb54a164b64f1e85d94d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-becd64d3615fc5738da4c70610d8849e0a70bed8
\ No newline at end of file
+251ba1981e32fb80818965ffe1ef455069e88abd
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 9808af930ad3a6580e2f2ca7936fa6aee6a2ceb8..42a942bd0b00c54f42daf5b9c9b7c8eae7488e9b 100644 (file)
--- 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.286 2007/05/08 17:54:44 danielk1977 Exp $
+** $Id: expr.c,v 1.287 2007/05/08 18:04:46 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -663,7 +663,7 @@ void sqlite3ExprListCheckLength(
   int iLimit,
   const char *zObject
 ){
-  if( pEList->nExpr>iLimit ){
+  if( pEList && pEList->nExpr>iLimit ){
     sqlite3ErrorMsg(pParse, "too many columns in %s", zObject);
   }
 }