Fix a bug in out-of-memory processing introduced by check-in (3336). (CVS 3346)

FossilOrigin-Name: 8d98a205cbe9948039884947db33f41a63a09062

diff --git a/manifest b/manifest
index b2941463aea87a0ac1a813304fd617f36c88ca8e..ee723f10a49ac1f0fff8f44fcbdc29afb937eeac 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Require\swhitespace\sor\spunctuation\sbetween\sa\snumeric\sliteral\sand\san\nidentifier\sor\skeyword.\s\sTicket\s#1912.\s(CVS\s3345)
-D 2006-08-12T12:33:14
+C Fix\sa\sbug\sin\sout-of-memory\sprocessing\sintroduced\sby\scheck-in\s(3336).\s(CVS\s3346)
+D 2006-08-12T13:28:23
 F Makefile.in 9c2a76055c305868cc5f5b73e29a252ff3632c0a
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -66,7 +66,7 @@ F src/pager.c e51c079b3cad8394898a6c22330150339103700a
 F src/pager.h 0cff9de5e9019cb695a04d18df8caaaff933a272
 F src/parse.y ecac666005bec0c813681a81de88d1de5d27577f
 F src/pragma.c cc12939bb74a6e28eb2e867e75175eecffe089a1
-F src/prepare.c 06fdfea0920f2fe67df29ce6b2eebc83a9e6aedf
+F src/prepare.c 84e2c855600c7bfbe2ca691b263301de525f9123
 F src/printf.c b179b6ed12f793e028dd169e2e2e2b2a37eedc63
 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
 F src/select.c 0d4724930a1f34c747105ed1802fa4af0d8eb519
@@ -377,7 +377,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 924ea730f4dd384d7ef3deca357befd064dac70a
-R c84be7546d2eb42c47883b4193b9aa30
+P 0f667c4abd73bbb806a5efb31b0aba6efaf40fb8
+R a8c31200fcc8f48468c75930300e9f9d
 U drh
-Z 3e1bc30e7fc972dc1a9935e1b2be02e3
+Z 4b532ece7981c40705cd0ee53d51dac0

diff --git a/manifest.uuid b/manifest.uuid
index 74bd6454126d28f4d542047fd26ef0dd5b2a6781..456e465181de034f6f15a720b69fbac5d73f7cf1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0f667c4abd73bbb806a5efb31b0aba6efaf40fb8
\ No newline at end of file
+8d98a205cbe9948039884947db33f41a63a09062
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index 5d65dc023dbe3543a13bd2294934b25056b2fc29..b89059b85df17d9879a3072832355fd1b1fdacfb 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -13,7 +13,7 @@
 ** interface, and routines that contribute to loading the database schema
 ** from disk.
 **
-** $Id: prepare.c,v 1.37 2006/07/26 13:43:31 drh Exp $
+** $Id: prepare.c,v 1.38 2006/08/12 13:28:23 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -52,6 +52,7 @@ int sqlite3InitCallback(void *pInit, int argc, char **argv, char **azColName){
 
   pData->rc = SQLITE_OK;
   if( sqlite3MallocFailed() ){
+    corruptSchema(pData, 0);
     return SQLITE_NOMEM;
   }