Fix an assertion failure caused by (3851). (CVS 3852)

FossilOrigin-Name: 24683f1d29c5d312d6cabe2dde52d7c0424f629a

diff --git a/manifest b/manifest
index 8cea4299ad9a255fb534aedc1d298d7d22b86f58..cc808d06d50e80ba576dc241de05923ca9d14434 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\schanges\s(mainly\sto\sassert()\smacros)\sto\shandle\smalloc\sfailure\sin\svtab\soperations.\s(CVS\s3851)
-D 2007-04-18T14:24:33
+C Fix\san\sassertion\sfailure\scaused\sby\s(3851).\s(CVS\s3852)
+D 2007-04-18T14:47:24
 F Makefile.in 8cab54f7c9f5af8f22fd97ddf1ecfd1e1860de62
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -60,7 +60,7 @@ F src/attach.c a16ada4a4654a0d126b8223ec9494ebb81bc5c3c
 F src/auth.c 902f4722661c796b97f007d9606bd7529c02597f
 F src/btree.c 2023a8371bd23c300571a4ce9673b8859c44be36
 F src/btree.h 9b2cc0d113c0bc2d37d244b9a394d56948c9acbf
-F src/build.c 8ad4f8944d0f4cc93175bbfa8ca2a53e137072c5
+F src/build.c 1880da163d9aa404016242b8b76d69907f682cd8
 F src/callback.c 6414ed32d55859d0f65067aa5b88d2da27b3af9e
 F src/complete.c 7d1a44be8f37de125fcafd3d3a018690b3799675
 F src/date.c 74b76691bddf58b634f6bf4a77c8c58234268c6e
@@ -459,7 +459,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 852100a332d9f602e5f6285d2b7e19a3060c6162
-R 2c5025bb9e89555298dde4c0e521837d
+P 175156d1fcaadab3b955597abb27f6b9043bbb5b
+R 82ca28b3f62eedfa7335fb3cb839a54b
 U danielk1977
-Z a40be68094d24301cad1702ed45b3e42
+Z 048e43909ecdf04bdc06e3382ce03cff

diff --git a/manifest.uuid b/manifest.uuid
index 2afe03d58e8a3bc04d58c78b2ab180749cdc6f15..85f6d3ab02dcab022e4893bf2227b57ee146eb04 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-175156d1fcaadab3b955597abb27f6b9043bbb5b
\ No newline at end of file
+24683f1d29c5d312d6cabe2dde52d7c0424f629a
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index a5f92c9a066316e26bdf2670c1612274a40827b1..41bb82b019c87fe9ddd2adc630bcff26f43ee5cf 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -22,7 +22,7 @@
 **     COMMIT
 **     ROLLBACK
 **
-** $Id: build.c,v 1.420 2007/04/16 15:06:25 danielk1977 Exp $
+** $Id: build.c,v 1.421 2007/04/18 14:47:24 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -2203,7 +2203,7 @@ static void sqlite3RefillIndex(Parse *pParse, Index *pIndex, int memRootPage){
     sqlite3VdbeAddOp(v, OP_IsUnique, iIdx, addr2);
     sqlite3VdbeOp3(v, OP_Halt, SQLITE_CONSTRAINT, OE_Abort,
                     "indexed columns are not unique", P3_STATIC);
-    assert( addr2==sqlite3VdbeCurrentAddr(v) );
+    assert( sqlite3MallocFailed() || addr2==sqlite3VdbeCurrentAddr(v) );
   }
   sqlite3VdbeAddOp(v, OP_IdxInsert, iIdx, 0);
   sqlite3VdbeAddOp(v, OP_Next, iTab, addr1+1);