From: drh <drh@noemail.net>
Date: Tue, 23 Sep 2003 10:25:32 +0000 (+0000)
Subject: A failed malloc() could have resulted in a segfault.  Fixed by this check-in. (CVS... 
X-Git-Tag: version-3.6.10~4966
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=f911221a1ecf3718a35c26c11c0b021dc214fe7d;p=thirdparty%2Fsqlite.git

A failed malloc() could have resulted in a segfault.  Fixed by this check-in. (CVS 1102)

FossilOrigin-Name: 4bb256ee3ecd44d71d90556e16bb56c0389fd5b5
---

diff --git a/manifest b/manifest
index e3bd7591e8..ea4c8d29f3 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C allow\s-enable-releasemode\sas\san\soption\sand\sallow\sMakefile\sto\sproduce\sversion\nindependent\sbinary\slike\slibsqlite-2.8.6.so\sinstead\sof\slibsqlite.so.0.0.0\s(CVS\s1101)
-D 2003-09-23T00:36:50
+C A\sfailed\smalloc()\scould\shave\sresulted\sin\sa\ssegfault.\s\sFixed\sby\sthis\scheck-in.\s(CVS\s1102)
+D 2003-09-23T10:25:33
 F Makefile.in ab585a91e34bc33928a1b6181fa2f6ebd4fb17e1
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -30,7 +30,7 @@ F src/build.c 9def3a3b8fba59325ed686049b88c2e7aff9af12
 F src/copy.c 9e47975ea96751c658bcf1a0c4f0bb7c6ee61e73
 F src/delete.c 0f81e6799c089487615d38e042a2de4d2d6192bc
 F src/encode.c 25ea901a9cefb3d93774afa4a06b57cb58acf544
-F src/expr.c 8acdc2f7b2e756fc62336c728ab6a579979a5719
+F src/expr.c d4d8eca6363a6e680361e5d2a934b78e5c7b7fa3
 F src/func.c 377ea94127351de27892a62a63f931e0fbaa33d4
 F src/hash.c 058f077c1f36f266581aa16f907a3903abf64aa3
 F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
@@ -173,7 +173,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P b85847b8f28f8f4be9e7f3d8674ecf42e1c5db38
-R e1c1aae069ec958caa9969a82d5e8e98
-U xdong
-Z 34c69a53636ef0b13df9e88f8bafbccc
+P 4fdd44a5ee5f7beb3cff11bc54fd3022b975b9e6
+R 0074487beb6e741081cb3a63c6722144
+U drh
+Z 3c9475381ebc19cc18ae14d0f50d9455
diff --git a/manifest.uuid b/manifest.uuid
index cef4837d23..2986555b6e 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4fdd44a5ee5f7beb3cff11bc54fd3022b975b9e6
\ No newline at end of file
+4bb256ee3ecd44d71d90556e16bb56c0389fd5b5
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 398bf8f629..a2482fe0ca 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.100 2003/09/06 22:18:08 drh Exp $
+** $Id: expr.c,v 1.101 2003/09/23 10:25:33 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -265,7 +265,7 @@ ExprList *sqliteExprListAppend(ExprList *pList, Expr *pExpr, Token *pName){
     }
     pList->a = a;
   }
-  if( pExpr || pName ){
+  if( pList->a && (pExpr || pName) ){
     i = pList->nExpr++;
     pList->a[i].pExpr = pExpr;
     pList->a[i].zName = 0;