Fix a memory allocation problem in os_test.c (CVS 1782)

FossilOrigin-Name: ed511c2ea9581933ca504ce4b43d863503c6cc22

diff --git a/manifest b/manifest
index f2f7fe24981d8e06475ad31d485b49bf92334309..6795ea544230d4c292d191789b23a6119f49cc95 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Coverage\simprovements\sfor\smalloc\sand\svdbemem.c\s(CVS\s1781)
-D 2004-06-30T11:54:07
+C Fix\sa\smemory\sallocation\sproblem\sin\sos_test.c\s(CVS\s1782)
+D 2004-06-30T12:42:59
 F Makefile.in f5788bf4daea9b25424df5ccb529ac3438efb2b2
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -44,7 +44,7 @@ F src/os.h d1780e0db95cad01f213d48da22ab490eb4fd345
 F src/os_common.h fe9604754116bd2f2702d58f82d2d8b89998cb21
 F src/os_mac.c 3d31e26be1411acfb7961033098631b4f3486fdf
 F src/os_mac.h 51d2445f47e182ed32d3bd6937f81070c6fd9bd4
-F src/os_test.c 5ae69ff4f27ed217833825bc836dcdc6cfecba15
+F src/os_test.c 6bf10100de2ca199a91fe7ac6474561c8a7166ae
 F src/os_test.h 6a26a4978492e4bbdbf385554958418ff02db162
 F src/os_unix.c 7df6ae05faa5b84164193d3694cb71b66661bbf3
 F src/os_unix.h 00c1f82b526ab2fb7ee5ddd555ea4ed68363c93a
@@ -61,7 +61,7 @@ F src/shell.c ebec5da57ea401f4886eefc790917b939d94d595
 F src/sqlite.h.in b70fded2bdfeaddfb06adea3888118b722975136
 F src/sqliteInt.h 9dcfcc67fc995b9079074d6b9619a1d4335583d0
 F src/table.c 4521c278892f60e4d630788c0ea5cf4db1e75c49
-F src/tclsqlite.c 0bdfed5cc93826a261dead2ad31502056bcf6e92
+F src/tclsqlite.c 62848128011e59291902c6e5c6f910c05956fcbb
 F src/test1.c 470430e194e43abb7d05b993fb360344f3d58834
 F src/test2.c dafd8bd314a554bf376c6d3a8c83fd69219f5a40
 F src/test3.c d0c56667e89f79ad0f060fdf010d1c34a4bc2988
@@ -233,7 +233,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 42553001954356c942b874e95277efe235ef7692
-R 60019ba81d7b4ee61c8fcace4daff4a1
+P a98dd004c4d328eb44a71fecdbf8c5ab416dc524
+R c0688e6bbb815a8d0503d70a0e36d154
 U danielk1977
-Z 3bf0bd77bf9abeca54609b89ed1a42c8
+Z d7bcae3abcff61a6164622b223681da2

diff --git a/manifest.uuid b/manifest.uuid
index b0c5cc4830f365567f9fcc7fd1b830acc2c586bd..7ef7da5f64da024eab9d25a564d02c42e234a30a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a98dd004c4d328eb44a71fecdbf8c5ab416dc524
\ No newline at end of file
+ed511c2ea9581933ca504ce4b43d863503c6cc22
\ No newline at end of file

diff --git a/src/os_test.c b/src/os_test.c
index f9091202c11285d9877f5ebc6a3f6d1fdf9f5f83..a69ba50e1c3cec457ed016f676bb6bb227637885 100644 (file)
--- a/src/os_test.c
+++ b/src/os_test.c
@@ -159,6 +159,7 @@ static int cacheBlock(OsTestFile *pFile, int blk){
     int n = ((pFile->nBlk * 2) + 100 + blk);
     pFile->apBlk = (u8 **)sqliteRealloc(pFile->apBlk, n * sizeof(u8*));
     if( !pFile->apBlk ) return SQLITE_NOMEM;
+    memset(&pFile->apBlk[pFile->nBlk], 0, (n - pFile->nBlk)*sizeof(u8*));
     pFile->nBlk = n;
   }
 

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 652f65f09937eac2fd7dcfaa6c74a214ebb10113..7e9b463a0c0220b01d6b70ac40266dc3c90be571 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.94 2004/06/30 11:54:07 danielk1977 Exp $
+** $Id: tclsqlite.c,v 1.95 2004/06/30 12:42:59 danielk1977 Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -1081,10 +1081,14 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
 #ifdef SQLITE_TEST
   {
     extern void Md5_Register(sqlite*);
+#ifdef SQLITE_DEBUG
     int mallocfail = sqlite3_iMallocFail;
     sqlite3_iMallocFail = 0;
+#endif
     Md5_Register(p->db);
+#ifdef SQLITE_DEBUG
     sqlite3_iMallocFail = mallocfail;
+#endif
    }
 #endif  
   p->interp = interp;